335 files changed, 7035 insertions, 2926 deletions

diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c
index 4d07cce9c5d9..7e11ef4cb7db 100644
--- a/drivers/bcma/driver_chipcommon_sflash.c
+++ b/drivers/bcma/driver_chipcommon_sflash.c
@@ -38,7 +38,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
         { "M25P32", 0x15, 0x10000, 64, },
         { "M25P64", 0x16, 0x10000, 128, },
         { "M25FL128", 0x17, 0x10000, 256, },
-        { 0 },
+        { NULL },
 };
 
 static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
@@ -56,7 +56,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
         { "SST25VF016", 0x41, 0x1000, 512, },
         { "SST25VF032", 0x4a, 0x1000, 1024, },
         { "SST25VF064", 0x4b, 0x1000, 2048, },
-        { 0 },
+        { NULL },
 };
 
 static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
@@ -67,7 +67,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
         { "AT45DB161", 0x2c, 512, 4096, },
         { "AT45DB321", 0x34, 512, 8192, },
         { "AT45DB642", 0x3c, 1024, 8192, },
-        { 0 },
+        { NULL },
 };
 
 static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index b61440aaee65..83f6437dd91d 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -73,6 +73,7 @@ struct btsdio_data {
 #define REG_CL_INTRD 0x13       /* Interrupt Clear */
 #define REG_EN_INTRD 0x14       /* Interrupt Enable */
 #define REG_MD_STAT  0x20       /* Bluetooth Mode Status */
+#define REG_MD_SET   0x20       /* Bluetooth Mode Set */
 
 static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb)
 {
@@ -212,7 +213,7 @@ static int btsdio_open(struct hci_dev *hdev)
         }
 
         if (data->func->class == SDIO_CLASS_BT_B)
-                sdio_writeb(data->func, 0x00, REG_MD_STAT, NULL);
+                sdio_writeb(data->func, 0x00, REG_MD_SET, NULL);
 
         sdio_writeb(data->func, 0x01, REG_EN_INTRD, NULL);
 
@@ -333,6 +334,9 @@ static int btsdio_probe(struct sdio_func *func,
         hdev->flush    = btsdio_flush;
         hdev->send     = btsdio_send_frame;
 
+        if (func->vendor == 0x0104 && func->device == 0x00c5)
+                set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
+
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 9f7e539de510..baeaaed299e4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -965,6 +965,45 @@ static int btusb_setup_bcm92035(struct hci_dev *hdev)
         return 0;
 }
 
+static int btusb_setup_csr(struct hci_dev *hdev)
+{
+        struct hci_rp_read_local_version *rp;
+        struct sk_buff *skb;
+        int ret;
+
+        BT_DBG("%s", hdev->name);
+
+        skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,
+                             HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("Reading local version failed (%ld)", -PTR_ERR(skb));
+                return -PTR_ERR(skb);
+        }
+
+        rp = (struct hci_rp_read_local_version *) skb->data;
+
+        if (!rp->status) {
+                if (le16_to_cpu(rp->manufacturer) != 10) {
+                        /* Clear the reset quirk since this is not an actual
+                         * early Bluetooth 1.1 device from CSR.
+                         */
+                        clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
+
+                        /* These fake CSR controllers have all a broken
+                         * stored link key handling and so just disable it.
+                         */
+                        set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY,
+                                &hdev->quirks);
+                }
+        }
+
+        ret = -bt_to_errno(rp->status);
+
+        kfree_skb(skb);
+
+        return ret;
+}
+
 struct intel_version {
         u8 status;
         u8 hw_platform;
@@ -1465,10 +1504,15 @@ static int btusb_probe(struct usb_interface *intf,
 
         if (id->driver_info & BTUSB_CSR) {
                 struct usb_device *udev = data->udev;
+                u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);
 
                 /* Old firmware would otherwise execute USB reset */
-                if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117)
+                if (bcdDevice < 0x117)
                         set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
+
+                /* Fake CSR devices with broken commands */
+                if (bcdDevice <= 0x100)
+                        hdev->setup = btusb_setup_csr;
         }
 
         if (id->driver_info & BTUSB_SNIFFER) {
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 7b167385a1c4..1ef6990a5c7e 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -141,22 +141,28 @@ static int vhci_create_device(struct vhci_data *data, __u8 dev_type)
 }
 
 static inline ssize_t vhci_get_user(struct vhci_data *data,
-                                    const char __user *buf, size_t count)
+                                    const struct iovec *iov,
+                                    unsigned long count)
 {
+        size_t len = iov_length(iov, count);
         struct sk_buff *skb;
         __u8 pkt_type, dev_type;
+        unsigned long i;
         int ret;
 
-        if (count < 2 || count > HCI_MAX_FRAME_SIZE)
+        if (len < 2 || len > HCI_MAX_FRAME_SIZE)
                 return -EINVAL;
 
-        skb = bt_skb_alloc(count, GFP_KERNEL);
+        skb = bt_skb_alloc(len, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
-        if (copy_from_user(skb_put(skb, count), buf, count)) {
-                kfree_skb(skb);
-                return -EFAULT;
+        for (i = 0; i < count; i++) {
+                if (copy_from_user(skb_put(skb, iov[i].iov_len),
+                                   iov[i].iov_base, iov[i].iov_len)) {
+                        kfree_skb(skb);
+                        return -EFAULT;
+                }
         }
 
         pkt_type = *((__u8 *) skb->data);
@@ -205,7 +211,7 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,
                 return -EINVAL;
         }
 
-        return (ret < 0) ? ret : count;
+        return (ret < 0) ? ret : len;
 }
 
 static inline ssize_t vhci_put_user(struct vhci_data *data,
@@ -272,12 +278,13 @@ static ssize_t vhci_read(struct file *file,
         return ret;
 }
 
-static ssize_t vhci_write(struct file *file,
-                          const char __user *buf, size_t count, loff_t *pos)
+static ssize_t vhci_write(struct kiocb *iocb, const struct iovec *iov,
+                          unsigned long count, loff_t pos)
 {
+        struct file *file = iocb->ki_filp;
         struct vhci_data *data = file->private_data;
 
-        return vhci_get_user(data, buf, count);
+        return vhci_get_user(data, iov, count);
 }
 
 static unsigned int vhci_poll(struct file *file, poll_table *wait)
@@ -342,7 +349,7 @@ static int vhci_release(struct inode *inode, struct file *file)
 static const struct file_operations vhci_fops = {
         .owner          = THIS_MODULE,
         .read           = vhci_read,
-        .write          = vhci_write,
+        .aio_write      = vhci_write,
         .poll           = vhci_poll,
         .open           = vhci_open,
         .release        = vhci_release,
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index b97e35c33d17..16782b2cff49 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -50,13 +50,13 @@
 #include "cxgb4_uld.h"
 
 #define T4FW_VERSION_MAJOR 0x01
-#define T4FW_VERSION_MINOR 0x06
-#define T4FW_VERSION_MICRO 0x18
+#define T4FW_VERSION_MINOR 0x09
+#define T4FW_VERSION_MICRO 0x17
 #define T4FW_VERSION_BUILD 0x00
 
 #define T5FW_VERSION_MAJOR 0x01
-#define T5FW_VERSION_MINOR 0x08
-#define T5FW_VERSION_MICRO 0x1C
+#define T5FW_VERSION_MINOR 0x09
+#define T5FW_VERSION_MICRO 0x17
 #define T5FW_VERSION_BUILD 0x00
 
 #define CH_WARN(adap, fmt, ...) dev_warn(adap->pdev_dev, fmt, ## __VA_ARGS__)
diff --git a/drivers/net/ethernet/intel/i40e/Makefile b/drivers/net/ethernet/intel/i40e/Makefile
index 479b2c4e552d..6ec1a795f184 100644
--- a/drivers/net/ethernet/intel/i40e/Makefile
+++ b/drivers/net/ethernet/intel/i40e/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel Ethernet Controller XL710 Family Linux Driver
-# Copyright(c) 2013 Intel Corporation.
+# Copyright(c) 2013 - 2014 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # The full GNU General Public License is included in this distribution in
 # the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 09d92d00cb13..4d4cdbf6fad7 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 2b320841a108..c75aa2d07491 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -584,6 +583,9 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)
                 goto init_adminq_free_arq;
         }
 
+        /* pre-emptive resource lock release */
+        i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);
+
         ret_code = i40e_aq_set_hmc_resource_profile(hw,
                                                     I40E_HMC_PROFILE_DEFAULT,
                                                     0,
@@ -862,7 +864,7 @@ void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
         /* zero out the desc */
         memset((void *)desc, 0, sizeof(struct i40e_aq_desc));
         desc->opcode = cpu_to_le16(opcode);
-        desc->flags = cpu_to_le16(I40E_AQ_FLAG_EI | I40E_AQ_FLAG_SI);
+        desc->flags = cpu_to_le16(I40E_AQ_FLAG_SI);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.h b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
index 21801c3d65dd..993f7685a911 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index 007508772cf0..c009eb47058a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_alloc.h b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
index 3b1cc214f9dc..926811ad44ac 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index d564910b4f58..807312bb62a2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -255,8 +254,11 @@ i40e_status i40e_aq_mac_address_write(struct i40e_hw *hw,
         i40e_fill_default_direct_cmd_desc(&desc,
                                           i40e_aqc_opc_mac_address_write);
         cmd_data->command_flags = cpu_to_le16(flags);
-        memcpy(&cmd_data->mac_sal, &mac_addr[0], 4);
-        memcpy(&cmd_data->mac_sah, &mac_addr[4], 2);
+        cmd_data->mac_sah = cpu_to_le16((u16)mac_addr[0] << 8 | mac_addr[1]);
+        cmd_data->mac_sal = cpu_to_le32(((u32)mac_addr[2] << 24) |
+                                        ((u32)mac_addr[3] << 16) |
+                                        ((u32)mac_addr[4] << 8) |
+                                        mac_addr[5]);
 
         status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 125f758a03ac..0220b18b2b18 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -516,10 +515,10 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
                          rx_ring->stats.bytes,
                          rx_ring->rx_stats.non_eop_descs);
                 dev_info(&pf->pdev->dev,
-                         "    rx_rings[%i]: rx_stats: alloc_rx_page_failed = %lld, alloc_rx_buff_failed = %lld\n",
+                         "    rx_rings[%i]: rx_stats: alloc_page_failed = %lld, alloc_buff_failed = %lld\n",
                          i,
-                         rx_ring->rx_stats.alloc_rx_page_failed,
-                        rx_ring->rx_stats.alloc_rx_buff_failed);
+                         rx_ring->rx_stats.alloc_page_failed,
+                         rx_ring->rx_stats.alloc_buff_failed);
                 dev_info(&pf->pdev->dev,
                          "    rx_rings[%i]: size = %i, dma = 0x%08lx\n",
                          i, rx_ring->size,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.c b/drivers/net/ethernet/intel/i40e/i40e_diag.c
index 6a1657e62418..b2380daef8c1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_diag.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_diag.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.h b/drivers/net/ethernet/intel/i40e/i40e_diag.h
index d1fc68cd6c94..0b5911652084 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_diag.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 42c36d18e8c6..b886ee5bd99d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -1244,6 +1243,7 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
 }
 
 #define IP_HEADER_OFFSET 14
+#define I40E_UDPIP_DUMMY_PACKET_LEN 42
 /**
  * i40e_add_del_fdir_udpv4 - Add/Remove UDPv4 Flow Director filters for
  * a specific flow spec
@@ -1264,6 +1264,12 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,
         bool err = false;
         int ret;
         int i;
+        char packet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0,
+                         0x45, 0, 0, 0x1c, 0, 0, 0x40, 0, 0x40, 0x11,
+                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                         0, 0, 0, 0, 0, 0, 0, 0};
+
+        memcpy(fd_data->raw_packet, packet, I40E_UDPIP_DUMMY_PACKET_LEN);
 
         ip = (struct iphdr *)(fd_data->raw_packet + IP_HEADER_OFFSET);
         udp = (struct udphdr *)(fd_data->raw_packet + IP_HEADER_OFFSET
@@ -1294,6 +1300,7 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,
         return err ? -EOPNOTSUPP : 0;
 }
 
+#define I40E_TCPIP_DUMMY_PACKET_LEN 54
 /**
  * i40e_add_del_fdir_tcpv4 - Add/Remove TCPv4 Flow Director filters for
  * a specific flow spec
@@ -1313,6 +1320,14 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,
         struct iphdr *ip;
         bool err = false;
         int ret;
+        /* Dummy packet */
+        char packet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0,
+                         0x45, 0, 0, 0x28, 0, 0, 0x40, 0, 0x40, 0x6,
+                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                         0x80, 0x11, 0x0, 0x72, 0, 0, 0, 0};
+
+        memcpy(fd_data->raw_packet, packet, I40E_TCPIP_DUMMY_PACKET_LEN);
 
         ip = (struct iphdr *)(fd_data->raw_packet + IP_HEADER_OFFSET);
         tcp = (struct tcphdr *)(fd_data->raw_packet + IP_HEADER_OFFSET
@@ -1320,6 +1335,8 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,
 
         ip->daddr = fsp->h_u.tcp_ip4_spec.ip4dst;
         tcp->dest = fsp->h_u.tcp_ip4_spec.pdst;
+        ip->saddr = fsp->h_u.tcp_ip4_spec.ip4src;
+        tcp->source = fsp->h_u.tcp_ip4_spec.psrc;
 
         fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN;
         ret = i40e_program_fdir_filter(fd_data, pf, add);
@@ -1334,9 +1351,6 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,
                          fd_data->pctype, ret);
         }
 
-        ip->saddr = fsp->h_u.tcp_ip4_spec.ip4src;
-        tcp->source = fsp->h_u.tcp_ip4_spec.psrc;
-
         fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP;
 
         ret = i40e_program_fdir_filter(fd_data, pf, add);
@@ -1370,6 +1384,7 @@ static int i40e_add_del_fdir_sctpv4(struct i40e_vsi *vsi,
         return -EOPNOTSUPP;
 }
 
+#define I40E_IP_DUMMY_PACKET_LEN 34
 /**
  * i40e_add_del_fdir_ipv4 - Add/Remove IPv4 Flow Director filters for
  * a specific flow spec
@@ -1389,7 +1404,11 @@ static int i40e_add_del_fdir_ipv4(struct i40e_vsi *vsi,
         bool err = false;
         int ret;
         int i;
+        char packet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0,
+                         0x45, 0, 0, 0x14, 0, 0, 0x40, 0, 0x40, 0x10,
+                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
+        memcpy(fd_data->raw_packet, packet, I40E_IP_DUMMY_PACKET_LEN);
         ip = (struct iphdr *)(fd_data->raw_packet + IP_HEADER_OFFSET);
 
         ip->saddr = fsp->h_u.usr_ip4_spec.ip4src;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
index bcedf3fb1143..76dfef3e0104 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_hmc.h
index aacd42a261e9..72bf30aba150 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
index a695b91c9c79..101ed4107312 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
index f8afbcb053c5..341de925a298 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index f736c4470412..1b792ee592d0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -423,7 +422,7 @@ void i40e_vsi_reset_stats(struct i40e_vsi *vsi)
         memset(&vsi->net_stats_offsets, 0, sizeof(vsi->net_stats_offsets));
         memset(&vsi->eth_stats, 0, sizeof(vsi->eth_stats));
         memset(&vsi->eth_stats_offsets, 0, sizeof(vsi->eth_stats_offsets));
-        if (vsi->rx_rings)
+        if (vsi->rx_rings && vsi->rx_rings[0]) {
                 for (i = 0; i < vsi->num_queue_pairs; i++) {
                         memset(&vsi->rx_rings[i]->stats, 0 ,
                                sizeof(vsi->rx_rings[i]->stats));
@@ -434,6 +433,7 @@ void i40e_vsi_reset_stats(struct i40e_vsi *vsi)
                         memset(&vsi->tx_rings[i]->tx_stats, 0,
                                sizeof(vsi->tx_rings[i]->tx_stats));
                 }
+        }
         vsi->stat_offsets_loaded = false;
 }
 
@@ -786,8 +786,8 @@ void i40e_update_stats(struct i40e_vsi *vsi)
                 } while (u64_stats_fetch_retry_bh(&p->syncp, start));
                 rx_b += bytes;
                 rx_p += packets;
-                rx_buf += p->rx_stats.alloc_rx_buff_failed;
-                rx_page += p->rx_stats.alloc_rx_page_failed;
+                rx_buf += p->rx_stats.alloc_buff_failed;
+                rx_page += p->rx_stats.alloc_page_failed;
         }
         rcu_read_unlock();
         vsi->tx_restart = tx_restart;
@@ -2068,8 +2068,11 @@ static void i40e_vsi_free_tx_resources(struct i40e_vsi *vsi)
 {
         int i;
 
+        if (!vsi->tx_rings)
+                return;
+
         for (i = 0; i < vsi->num_queue_pairs; i++)
-                if (vsi->tx_rings[i]->desc)
+                if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)
                         i40e_free_tx_resources(vsi->tx_rings[i]);
 }
 
@@ -2102,8 +2105,11 @@ static void i40e_vsi_free_rx_resources(struct i40e_vsi *vsi)
 {
         int i;
 
+        if (!vsi->rx_rings)
+                return;
+
         for (i = 0; i < vsi->num_queue_pairs; i++)
-                if (vsi->rx_rings[i]->desc)
+                if (vsi->rx_rings[i] && vsi->rx_rings[i]->desc)
                         i40e_free_rx_resources(vsi->rx_rings[i]);
 }
 
@@ -2758,16 +2764,16 @@ static irqreturn_t i40e_intr(int irq, void *data)
 {
         struct i40e_pf *pf = (struct i40e_pf *)data;
         struct i40e_hw *hw = &pf->hw;
+        irqreturn_t ret = IRQ_NONE;
         u32 icr0, icr0_remaining;
         u32 val, ena_mask;
 
         icr0 = rd32(hw, I40E_PFINT_ICR0);
+        ena_mask = rd32(hw, I40E_PFINT_ICR0_ENA);
 
         /* if sharing a legacy IRQ, we might get called w/o an intr pending */
         if ((icr0 & I40E_PFINT_ICR0_INTEVENT_MASK) == 0)
-                return IRQ_NONE;
-
-        ena_mask = rd32(hw, I40E_PFINT_ICR0_ENA);
+                goto enable_intr;
 
         /* if interrupt but no bits showing, must be SWINT */
         if (((icr0 & ~I40E_PFINT_ICR0_INTEVENT_MASK) == 0) ||
@@ -2843,7 +2849,9 @@ static irqreturn_t i40e_intr(int irq, void *data)
                 }
                 ena_mask &= ~icr0_remaining;
         }
+        ret = IRQ_HANDLED;
 
+enable_intr:
         /* re-enable interrupt causes */
         wr32(hw, I40E_PFINT_ICR0_ENA, ena_mask);
         if (!test_bit(__I40E_DOWN, &pf->state)) {
@@ -2851,7 +2859,7 @@ static irqreturn_t i40e_intr(int irq, void *data)
                 i40e_irq_dynamic_enable_icr0(pf);
         }
 
-        return IRQ_HANDLED;
+        return ret;
 }
 
 /**
@@ -4514,10 +4522,13 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf)
                         dev_info(&pf->pdev->dev, "ARQ LAN queue overflow event received\n");
                         i40e_handle_lan_overflow_event(pf, &event);
                         break;
+                case i40e_aqc_opc_send_msg_to_peer:
+                        dev_info(&pf->pdev->dev, "ARQ: Msg from other pf\n");
+                        break;
                 default:
                         dev_info(&pf->pdev->dev,
-                                 "ARQ Error: Unknown event %d received\n",
-                                 event.desc.opcode);
+                                 "ARQ Error: Unknown event 0x%04x received\n",
+                                 opcode);
                         break;
                 }
         } while (pending && (i++ < pf->adminq_work_limit));
@@ -4647,7 +4658,7 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
                 }
         } while (err);
 
-        if (pf->hw.revision_id == 0 && pf->hw.func_caps.npar_enable) {
+        if (pf->hw.revision_id == 0 && (pf->flags & I40E_FLAG_MFP_ENABLED)) {
                 pf->hw.func_caps.num_msix_vectors += 1;
                 pf->hw.func_caps.num_tx_qp =
                         min_t(int, pf->hw.func_caps.num_tx_qp,
@@ -4784,7 +4795,7 @@ static int i40e_prep_for_reset(struct i40e_pf *pf)
 }
 
 /**
- * i40e_reset_and_rebuild - reset and rebuid using a saved config
+ * i40e_reset_and_rebuild - reset and rebuild using a saved config
  * @pf: board private structure
  * @reinit: if the Main VSI needs to re-initialized.
  **/
@@ -5348,7 +5359,7 @@ static void i40e_vsi_clear_rings(struct i40e_vsi *vsi)
 {
         int i;
 
-        if (vsi->tx_rings[0]) {
+        if (vsi->tx_rings && vsi->tx_rings[0]) {
                 for (i = 0; i < vsi->alloc_queue_pairs; i++) {
                         kfree_rcu(vsi->tx_rings[i], rcu);
                         vsi->tx_rings[i] = NULL;
@@ -5763,16 +5774,8 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)
         queue_count = rounddown_pow_of_two(queue_count);
 
         if (queue_count != pf->rss_size) {
-                if (pf->queues_left < (queue_count - pf->rss_size)) {
-                        dev_info(&pf->pdev->dev,
-                                "Not enough queues to do RSS on %d queues: remaining queues %d\n",
-                                queue_count, pf->queues_left);
-                        return pf->rss_size;
-                }
                 i40e_prep_for_reset(pf);
 
-                pf->num_lan_qps += (queue_count - pf->rss_size);
-                pf->queues_left -= (queue_count - pf->rss_size);
                 pf->rss_size = queue_count;
 
                 i40e_reset_and_rebuild(pf, true);
@@ -5809,7 +5812,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
         pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
                     I40E_FLAG_MSI_ENABLED     |
                     I40E_FLAG_MSIX_ENABLED    |
-                    I40E_FLAG_RX_PS_ENABLED   |
                     I40E_FLAG_RX_1BUF_ENABLED;
 
         /* Depending on PF configurations, it is possible that the RSS
@@ -5825,6 +5827,12 @@ static int i40e_sw_init(struct i40e_pf *pf)
                 pf->rss_size = 1;
         }
 
+        /* MFP mode enabled */
+        if (pf->hw.func_caps.npar_enable || pf->hw.func_caps.mfp_mode_1) {
+                pf->flags |= I40E_FLAG_MFP_ENABLED;
+                dev_info(&pf->pdev->dev, "MFP mode Enabled\n");
+        }
+
         if (pf->hw.func_caps.dcb)
                 pf->num_tc_qps = I40E_DEFAULT_QUEUES_PER_TC;
         else
@@ -5853,12 +5861,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
                 pf->num_vmdq_qps = I40E_DEFAULT_QUEUES_PER_VMDQ;
         }
 
-        /* MFP mode enabled */
-        if (pf->hw.func_caps.npar_enable || pf->hw.func_caps.mfp_mode_1) {
-                pf->flags |= I40E_FLAG_MFP_ENABLED;
-                dev_info(&pf->pdev->dev, "MFP mode Enabled\n");
-        }
-
 #ifdef CONFIG_PCI_IOV
         if (pf->hw.func_caps.num_vfs) {
                 pf->num_vf_qps = I40E_DEFAULT_QUEUES_PER_VF;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
index e2da0a2784dd..37d66c87abc9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
index 702c81ba86e3..ecd0f0b663c9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index e05d303105a7..c7c3d8231b36 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h
index d188ec03aff2..1d40f425acf1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_register.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_register.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_status.h b/drivers/net/ethernet/intel/i40e/i40e_status.h
index 5e5bcddac573..5f9cac55aa55 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_status.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_status.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index fac4fb37f87b..43d88dd66ed4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -775,7 +774,7 @@ void i40e_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count)
                         skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
                                                         rx_ring->rx_buf_len);
                         if (!skb) {
-                                rx_ring->rx_stats.alloc_rx_buff_failed++;
+                                rx_ring->rx_stats.alloc_buff_failed++;
                                 goto no_buffers;
                         }
                         /* initialize queue mapping */
@@ -789,7 +788,7 @@ void i40e_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count)
                                                  rx_ring->rx_buf_len,
                                                  DMA_FROM_DEVICE);
                         if (dma_mapping_error(rx_ring->dev, bi->dma)) {
-                                rx_ring->rx_stats.alloc_rx_buff_failed++;
+                                rx_ring->rx_stats.alloc_buff_failed++;
                                 bi->dma = 0;
                                 goto no_buffers;
                         }
@@ -799,7 +798,7 @@ void i40e_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count)
                         if (!bi->page) {
                                 bi->page = alloc_page(GFP_ATOMIC);
                                 if (!bi->page) {
-                                        rx_ring->rx_stats.alloc_rx_page_failed++;
+                                        rx_ring->rx_stats.alloc_page_failed++;
                                         goto no_buffers;
                                 }
                         }
@@ -814,7 +813,7 @@ void i40e_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count)
                                                             DMA_FROM_DEVICE);
                                 if (dma_mapping_error(rx_ring->dev,
                                                       bi->page_dma)) {
-                                        rx_ring->rx_stats.alloc_rx_page_failed++;
+                                        rx_ring->rx_stats.alloc_page_failed++;
                                         bi->page_dma = 0;
                                         goto no_buffers;
                                 }
@@ -991,15 +990,15 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                 skb = rx_bi->skb;
                 prefetch(skb->data);
 
-                rx_packet_len = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK)
-                                              >> I40E_RXD_QW1_LENGTH_PBUF_SHIFT;
-                rx_header_len = (qword & I40E_RXD_QW1_LENGTH_HBUF_MASK)
-                                              >> I40E_RXD_QW1_LENGTH_HBUF_SHIFT;
-                rx_sph = (qword & I40E_RXD_QW1_LENGTH_SPH_MASK)
-                                              >> I40E_RXD_QW1_LENGTH_SPH_SHIFT;
+                rx_packet_len = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>
+                                I40E_RXD_QW1_LENGTH_PBUF_SHIFT;
+                rx_header_len = (qword & I40E_RXD_QW1_LENGTH_HBUF_MASK) >>
+                                I40E_RXD_QW1_LENGTH_HBUF_SHIFT;
+                rx_sph = (qword & I40E_RXD_QW1_LENGTH_SPH_MASK) >>
+                         I40E_RXD_QW1_LENGTH_SPH_SHIFT;
 
-                rx_error = (qword & I40E_RXD_QW1_ERROR_MASK)
-                                              >> I40E_RXD_QW1_ERROR_SHIFT;
+                rx_error = (qword & I40E_RXD_QW1_ERROR_MASK) >>
+                           I40E_RXD_QW1_ERROR_SHIFT;
                 rx_hbo = rx_error & (1 << I40E_RX_DESC_ERROR_HBO_SHIFT);
                 rx_error &= ~(1 << I40E_RX_DESC_ERROR_HBO_SHIFT);
 
@@ -1115,8 +1114,8 @@ next_desc:
                 /* use prefetched values */
                 rx_desc = next_rxd;
                 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
-                rx_status = (qword & I40E_RXD_QW1_STATUS_MASK)
-                                                >> I40E_RXD_QW1_STATUS_SHIFT;
+                rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
+                            I40E_RXD_QW1_STATUS_SHIFT;
         }
 
         rx_ring->next_to_clean = i;
@@ -1415,10 +1414,10 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
         cd_cmd = I40E_TX_CTX_DESC_TSO;
         cd_tso_len = skb->len - *hdr_len;
         cd_mss = skb_shinfo(skb)->gso_size;
-        *cd_type_cmd_tso_mss |= ((u64)cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT)
-                             | ((u64)cd_tso_len
-                                << I40E_TXD_CTX_QW1_TSO_LEN_SHIFT)
-                             | ((u64)cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);
+        *cd_type_cmd_tso_mss |= ((u64)cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |
+                                ((u64)cd_tso_len <<
+                                 I40E_TXD_CTX_QW1_TSO_LEN_SHIFT) |
+                                ((u64)cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);
         return 1;
 }
 
@@ -1716,6 +1715,7 @@ dma_error:
 static inline int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)
 {
         netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
+        /* Memory barrier before checking head and tail */
         smp_mb();
 
         /* Check again in a case another CPU has just made room available. */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index 92f5cf5079e1..6f8506c181d9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -175,8 +174,8 @@ struct i40e_tx_queue_stats {
 
 struct i40e_rx_queue_stats {
         u64 non_eop_descs;
-        u64 alloc_rx_page_failed;
-        u64 alloc_rx_buff_failed;
+        u64 alloc_page_failed;
+        u64 alloc_buff_failed;
 };
 
 enum i40e_ring_state_t {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index bcf031773568..12473ad5c8e6 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -77,8 +76,6 @@
 struct i40e_hw;
 typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
 
-#define I40E_ETH_LENGTH_OF_ADDRESS      6
-
 /* Data type manipulation macros. */
 
 #define I40E_DESC_UNUSED(R)     \
@@ -240,9 +237,9 @@ struct i40e_hw_capabilities {
 
 struct i40e_mac_info {
         enum i40e_mac_type type;
-        u8 addr[I40E_ETH_LENGTH_OF_ADDRESS];
-        u8 perm_addr[I40E_ETH_LENGTH_OF_ADDRESS];
-        u8 san_addr[I40E_ETH_LENGTH_OF_ADDRESS];
+        u8 addr[ETH_ALEN];
+        u8 perm_addr[ETH_ALEN];
+        u8 san_addr[ETH_ALEN];
         u16 max_fcoeq;
 };
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
index cc6654f1dac7..22a1b69cd646 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -142,7 +141,7 @@ struct i40e_virtchnl_vsi_resource {
         u16 num_queue_pairs;
         enum i40e_vsi_type vsi_type;
         u16 qset_handle;
-        u8 default_mac_addr[I40E_ETH_LENGTH_OF_ADDRESS];
+        u8 default_mac_addr[ETH_ALEN];
 };
 /* VF offload flags */
 #define I40E_VIRTCHNL_VF_OFFLOAD_L2     0x00000001
@@ -265,7 +264,7 @@ struct i40e_virtchnl_queue_select {
  */
 
 struct i40e_virtchnl_ether_addr {
-        u8 addr[I40E_ETH_LENGTH_OF_ADDRESS];
+        u8 addr[ETH_ALEN];
         u8 pad[2];
 };
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index efb9a242d275..51a4f6125437 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
@@ -177,7 +176,8 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
                                        (I40E_MAX_VSI_QP *
                                         I40E_VIRTCHNL_SUPPORTED_QTYPES),
                                        next_q + 1);
-                if (next_q < (I40E_MAX_VSI_QP * I40E_VIRTCHNL_SUPPORTED_QTYPES)) {
+                if (next_q <
+                    (I40E_MAX_VSI_QP * I40E_VIRTCHNL_SUPPORTED_QTYPES)) {
                         vsi_queue_id = next_q / I40E_VIRTCHNL_SUPPORTED_QTYPES;
                         qtype = next_q % I40E_VIRTCHNL_SUPPORTED_QTYPES;
                         pf_queue_id = i40e_vc_get_pf_queue_id(vf, vsi_idx,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 8d0f4dd2a252..cc1feee36e12 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 2a30193d0d50..2dc82f1d2e70 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -62,8 +62,6 @@ config SIR_BFIN_PIO
         bool "PIO mode"
 endchoice
 
-comment "Dongle support"
-
 config SH_SIR
         tristate "SuperH SIR on UART"
         depends on IRDA && SUPERH && \
@@ -74,6 +72,8 @@ config SH_SIR
           Say Y here if your want to enable SIR function on SuperH UART
           devices.
 
+comment "Dongle support"
+
 config DONGLE
         bool "Serial dongle support"
         depends on IRTTY_SIR
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index ff45cd0d60e8..c96b46b2c3a8 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -804,7 +804,7 @@ static int sh_irda_probe(struct platform_device *pdev)
                 goto err_mem_4;
 
         platform_set_drvdata(pdev, ndev);
-        err = request_irq(irq, sh_irda_irq, 0, "sh_irda", self);
+        err = devm_request_irq(&pdev->dev, irq, sh_irda_irq, 0, "sh_irda", self);
         if (err) {
                 dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
                 goto err_mem_4;
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 8d9ae5a086d5..cadf52e22464 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -761,7 +761,7 @@ static int sh_sir_probe(struct platform_device *pdev)
                 goto err_mem_4;
 
         platform_set_drvdata(pdev, ndev);
-        err = request_irq(irq, sh_sir_irq, 0, "sh_sir", self);
+        err = devm_request_irq(&pdev->dev, irq, sh_sir_irq, 0, "sh_sir", self);
         if (err) {
                 dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
                 goto err_mem_4;
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 1d40c69cc4a9..55eda7afc041 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -15,7 +15,6 @@
  * more details.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 14128fd265ac..7e9ede6c5798 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -23,7 +23,6 @@
 #ifdef __IN_PCMCIA_PACKAGE__
 #include <pcmcia/k_compat.h>
 #endif
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/ptrace.h>
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 34c8a33cac06..031d4ec64779 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1721,7 +1721,7 @@ static void at76_mac80211_tx(struct ieee80211_hw *hw,
          * following workaround is necessary. If the TX frame is an
          * authentication frame extract the bssid and send the CMD_JOIN. */
         if (mgmt->frame_control & cpu_to_le16(IEEE80211_STYPE_AUTH)) {
-                if (!ether_addr_equal(priv->bssid, mgmt->bssid)) {
+                if (!ether_addr_equal_64bits(priv->bssid, mgmt->bssid)) {
                         memcpy(priv->bssid, mgmt->bssid, ETH_ALEN);
                         ieee80211_queue_work(hw, &priv->work_join_bssid);
                         dev_kfree_skb_any(skb);
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c
index 280fc3d53a36..8aa20df55e50 100644
--- a/drivers/net/wireless/ath/ar5523/ar5523.c
+++ b/drivers/net/wireless/ath/ar5523/ar5523.c
@@ -25,7 +25,6 @@
  * that and only has minimal functionality.
  */
 #include <linux/compiler.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/list.h>
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 69f58b073e85..6396ad4bce67 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1245,7 +1245,7 @@ ath5k_check_ibss_tsf(struct ath5k_hw *ah, struct sk_buff *skb,
 
         if (ieee80211_is_beacon(mgmt->frame_control) &&
             le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS &&
-            ether_addr_equal(mgmt->bssid, common->curbssid)) {
+            ether_addr_equal_64bits(mgmt->bssid, common->curbssid)) {
                 /*
                  * Received an IBSS beacon with the same BSSID. Hardware *must*
                  * have updated the local TSF. We have to work around various
@@ -1309,7 +1309,7 @@ ath5k_update_beacon_rssi(struct ath5k_hw *ah, struct sk_buff *skb, int rssi)
 
         /* only beacons from our BSSID */
         if (!ieee80211_is_beacon(mgmt->frame_control) ||
-            !ether_addr_equal(mgmt->bssid, common->curbssid))
+            !ether_addr_equal_64bits(mgmt->bssid, common->curbssid))
                 return;
 
         ewma_add(&ah->ah_beacon_rssi_avg, rssi);
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 149aba3c7298..d480d2f3e185 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -383,6 +383,20 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
         }
 }
 
+static void ar9002_hw_init_hang_checks(struct ath_hw *ah)
+{
+        if (AR_SREV_9100(ah) || AR_SREV_9160(ah)) {
+                ah->config.hw_hang_checks |= HW_BB_RIFS_HANG;
+                ah->config.hw_hang_checks |= HW_BB_DFS_HANG;
+        }
+
+        if (AR_SREV_9280(ah))
+                ah->config.hw_hang_checks |= HW_BB_RX_CLEAR_STUCK_HANG;
+
+        if (AR_SREV_5416(ah) || AR_SREV_9100(ah) || AR_SREV_9160(ah))
+                ah->config.hw_hang_checks |= HW_MAC_HANG;
+}
+
 /* Sets up the AR5008/AR9001/AR9002 hardware familiy callbacks */
 int ar9002_hw_attach_ops(struct ath_hw *ah)
 {
@@ -395,6 +409,7 @@ int ar9002_hw_attach_ops(struct ath_hw *ah)
                 return ret;
 
         priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;
+        priv_ops->init_hang_checks = ar9002_hw_init_hang_checks;
 
         ops->config_pci_powersave = ar9002_hw_configpcipowersave;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 97e09d5f3a42..8c145cd98c1c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -326,6 +326,224 @@ static void ar9003_hw_init_cal_settings(struct ath_hw *ah)
         ah->supp_cals = IQ_MISMATCH_CAL;
 }
 
+#define OFF_UPPER_LT 24
+#define OFF_LOWER_LT 7
+
+static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,
+                                              bool txiqcal_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ch0_done, osdac_ch0, dc_off_ch0_i1, dc_off_ch0_q1, dc_off_ch0_i2,
+                dc_off_ch0_q2, dc_off_ch0_i3, dc_off_ch0_q3;
+        int ch1_done, osdac_ch1, dc_off_ch1_i1, dc_off_ch1_q1, dc_off_ch1_i2,
+                dc_off_ch1_q2, dc_off_ch1_i3, dc_off_ch1_q3;
+        int ch2_done, osdac_ch2, dc_off_ch2_i1, dc_off_ch2_q1, dc_off_ch2_i2,
+                dc_off_ch2_q2, dc_off_ch2_i3, dc_off_ch2_q3;
+        bool status;
+        u32 temp, val;
+
+        /*
+         * Clear offset and IQ calibration, run AGC cal.
+         */
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_OFFSET_CAL);
+        REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
+                    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
+        REG_WRITE(ah, AR_PHY_AGC_CONTROL,
+                  REG_READ(ah, AR_PHY_AGC_CONTROL) | AR_PHY_AGC_CONTROL_CAL);
+
+        status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
+                               AR_PHY_AGC_CONTROL_CAL,
+                               0, AH_WAIT_TIMEOUT);
+        if (!status) {
+                ath_dbg(common, CALIBRATE,
+                        "AGC cal without offset cal failed to complete in 1ms");
+                return false;
+        }
+
+        /*
+         * Allow only offset calibration and disable the others
+         * (Carrier Leak calibration, TX Filter calibration and
+         *  Peak Detector offset calibration).
+         */
+        REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_OFFSET_CAL);
+        REG_CLR_BIT(ah, AR_PHY_CL_CAL_CTL,
+                    AR_PHY_CL_CAL_ENABLE);
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_FLTR_CAL);
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_PKDET_CAL);
+
+        ch0_done = 0;
+        ch1_done = 0;
+        ch2_done = 0;
+
+        while ((ch0_done == 0) || (ch1_done == 0) || (ch2_done == 0)) {
+                osdac_ch0 = (REG_READ(ah, AR_PHY_65NM_CH0_BB1) >> 30) & 0x3;
+                osdac_ch1 = (REG_READ(ah, AR_PHY_65NM_CH1_BB1) >> 30) & 0x3;
+                osdac_ch2 = (REG_READ(ah, AR_PHY_65NM_CH2_BB1) >> 30) & 0x3;
+
+                REG_SET_BIT(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+
+                REG_WRITE(ah, AR_PHY_AGC_CONTROL,
+                          REG_READ(ah, AR_PHY_AGC_CONTROL) | AR_PHY_AGC_CONTROL_CAL);
+
+                status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
+                                       AR_PHY_AGC_CONTROL_CAL,
+                                       0, AH_WAIT_TIMEOUT);
+                if (!status) {
+                        ath_dbg(common, CALIBRATE,
+                                "DC offset cal failed to complete in 1ms");
+                        return false;
+                }
+
+                REG_CLR_BIT(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+
+                /*
+                 * High gain.
+                 */
+                REG_WRITE(ah, AR_PHY_65NM_CH0_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH0_BB3) & 0xfffffcff) | (1 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH1_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH1_BB3) & 0xfffffcff) | (1 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH2_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH2_BB3) & 0xfffffcff) | (1 << 8)));
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH0_BB3);
+                dc_off_ch0_i1 = (temp >> 26) & 0x1f;
+                dc_off_ch0_q1 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH1_BB3);
+                dc_off_ch1_i1 = (temp >> 26) & 0x1f;
+                dc_off_ch1_q1 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH2_BB3);
+                dc_off_ch2_i1 = (temp >> 26) & 0x1f;
+                dc_off_ch2_q1 = (temp >> 21) & 0x1f;
+
+                /*
+                 * Low gain.
+                 */
+                REG_WRITE(ah, AR_PHY_65NM_CH0_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH0_BB3) & 0xfffffcff) | (2 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH1_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH1_BB3) & 0xfffffcff) | (2 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH2_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH2_BB3) & 0xfffffcff) | (2 << 8)));
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH0_BB3);
+                dc_off_ch0_i2 = (temp >> 26) & 0x1f;
+                dc_off_ch0_q2 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH1_BB3);
+                dc_off_ch1_i2 = (temp >> 26) & 0x1f;
+                dc_off_ch1_q2 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH2_BB3);
+                dc_off_ch2_i2 = (temp >> 26) & 0x1f;
+                dc_off_ch2_q2 = (temp >> 21) & 0x1f;
+
+                /*
+                 * Loopback.
+                 */
+                REG_WRITE(ah, AR_PHY_65NM_CH0_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH0_BB3) & 0xfffffcff) | (3 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH1_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH1_BB3) & 0xfffffcff) | (3 << 8)));
+                REG_WRITE(ah, AR_PHY_65NM_CH2_BB3,
+                          ((REG_READ(ah, AR_PHY_65NM_CH2_BB3) & 0xfffffcff) | (3 << 8)));
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH0_BB3);
+                dc_off_ch0_i3 = (temp >> 26) & 0x1f;
+                dc_off_ch0_q3 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH1_BB3);
+                dc_off_ch1_i3 = (temp >> 26) & 0x1f;
+                dc_off_ch1_q3 = (temp >> 21) & 0x1f;
+
+                temp = REG_READ(ah, AR_PHY_65NM_CH2_BB3);
+                dc_off_ch2_i3 = (temp >> 26) & 0x1f;
+                dc_off_ch2_q3 = (temp >> 21) & 0x1f;
+
+                if ((dc_off_ch0_i1 > OFF_UPPER_LT) || (dc_off_ch0_i1 < OFF_LOWER_LT) ||
+                    (dc_off_ch0_i2 > OFF_UPPER_LT) || (dc_off_ch0_i2 < OFF_LOWER_LT) ||
+                    (dc_off_ch0_i3 > OFF_UPPER_LT) || (dc_off_ch0_i3 < OFF_LOWER_LT) ||
+                    (dc_off_ch0_q1 > OFF_UPPER_LT) || (dc_off_ch0_q1 < OFF_LOWER_LT) ||
+                    (dc_off_ch0_q2 > OFF_UPPER_LT) || (dc_off_ch0_q2 < OFF_LOWER_LT) ||
+                    (dc_off_ch0_q3 > OFF_UPPER_LT) || (dc_off_ch0_q3 < OFF_LOWER_LT)) {
+                        if (osdac_ch0 == 3) {
+                                ch0_done = 1;
+                        } else {
+                                osdac_ch0++;
+
+                                val = REG_READ(ah, AR_PHY_65NM_CH0_BB1) & 0x3fffffff;
+                                val |= (osdac_ch0 << 30);
+                                REG_WRITE(ah, AR_PHY_65NM_CH0_BB1, val);
+
+                                ch0_done = 0;
+                        }
+                } else {
+                        ch0_done = 1;
+                }
+
+                if ((dc_off_ch1_i1 > OFF_UPPER_LT) || (dc_off_ch1_i1 < OFF_LOWER_LT) ||
+                    (dc_off_ch1_i2 > OFF_UPPER_LT) || (dc_off_ch1_i2 < OFF_LOWER_LT) ||
+                    (dc_off_ch1_i3 > OFF_UPPER_LT) || (dc_off_ch1_i3 < OFF_LOWER_LT) ||
+                    (dc_off_ch1_q1 > OFF_UPPER_LT) || (dc_off_ch1_q1 < OFF_LOWER_LT) ||
+                    (dc_off_ch1_q2 > OFF_UPPER_LT) || (dc_off_ch1_q2 < OFF_LOWER_LT) ||
+                    (dc_off_ch1_q3 > OFF_UPPER_LT) || (dc_off_ch1_q3 < OFF_LOWER_LT)) {
+                        if (osdac_ch1 == 3) {
+                                ch1_done = 1;
+                        } else {
+                                osdac_ch1++;
+
+                                val = REG_READ(ah, AR_PHY_65NM_CH1_BB1) & 0x3fffffff;
+                                val |= (osdac_ch1 << 30);
+                                REG_WRITE(ah, AR_PHY_65NM_CH1_BB1, val);
+
+                                ch1_done = 0;
+                        }
+                } else {
+                        ch1_done = 1;
+                }
+
+                if ((dc_off_ch2_i1 > OFF_UPPER_LT) || (dc_off_ch2_i1 < OFF_LOWER_LT) ||
+                    (dc_off_ch2_i2 > OFF_UPPER_LT) || (dc_off_ch2_i2 < OFF_LOWER_LT) ||
+                    (dc_off_ch2_i3 > OFF_UPPER_LT) || (dc_off_ch2_i3 < OFF_LOWER_LT) ||
+                    (dc_off_ch2_q1 > OFF_UPPER_LT) || (dc_off_ch2_q1 < OFF_LOWER_LT) ||
+                    (dc_off_ch2_q2 > OFF_UPPER_LT) || (dc_off_ch2_q2 < OFF_LOWER_LT) ||
+                    (dc_off_ch2_q3 > OFF_UPPER_LT) || (dc_off_ch2_q3 < OFF_LOWER_LT)) {
+                        if (osdac_ch2 == 3) {
+                                ch2_done = 1;
+                        } else {
+                                osdac_ch2++;
+
+                                val = REG_READ(ah, AR_PHY_65NM_CH2_BB1) & 0x3fffffff;
+                                val |= (osdac_ch2 << 30);
+                                REG_WRITE(ah, AR_PHY_65NM_CH2_BB1, val);
+
+                                ch2_done = 0;
+                        }
+                } else {
+                        ch2_done = 1;
+                }
+        }
+
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_OFFSET_CAL);
+        REG_SET_BIT(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+
+        /*
+         * We don't need to check txiqcal_done here since it is always
+         * set for AR9550.
+         */
+        REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
+                    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
+
+        return true;
+}
+
 /*
  * solve 4x4 linear equation used in loopback iq cal.
  */
@@ -1271,6 +1489,11 @@ static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
                 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
         }
 
+        if (AR_SREV_9550(ah) && IS_CHAN_2GHZ(chan)) {
+                if (!ar9003_hw_dynamic_osdac_selection(ah, txiqcal_done))
+                        return false;
+        }
+
 skip_tx_iqcal:
         if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
                 if (AR_SREV_9330_11(ah))
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index c8d22eccfef8..25243cbc07f0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3598,7 +3598,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
         if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                 REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
                                 AR_SWITCH_TABLE_COM_AR9462_ALL, value);
-        } else if (AR_SREV_9550(ah)) {
+        } else if (AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                 REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
                                 AR_SWITCH_TABLE_COM_AR9550_ALL, value);
         } else
@@ -3975,7 +3975,7 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)
         struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
         u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0];
 
-        if (AR_SREV_9340(ah))
+        if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
                 return;
 
         if (eep->baseEepHeader.featureEnable & 0x40) {
@@ -4030,7 +4030,10 @@ static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
         if (!(eep->baseEepHeader.featureEnable & 0x80))
                 return;
 
-        if (!AR_SREV_9300(ah) && !AR_SREV_9340(ah) && !AR_SREV_9580(ah))
+        if (!AR_SREV_9300(ah) &&
+            !AR_SREV_9340(ah) &&
+            !AR_SREV_9580(ah) &&
+            !AR_SREV_9531(ah))
                 return;
 
         xpa_ctl = ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
@@ -4163,7 +4166,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
         ar9003_hw_xlna_bias_strength_apply(ah, is2ghz);
         ar9003_hw_atten_apply(ah, chan);
         ar9003_hw_quick_drop_apply(ah, chan->channel);
-        if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah))
+        if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9531(ah))
                 ar9003_hw_internal_regulator_apply(ah);
         ar9003_hw_apply_tuning_caps(ah);
         ar9003_hw_apply_minccapwr_thresh(ah, chan);
@@ -4788,7 +4791,7 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
         }
 
 tempslope:
-        if (AR_SREV_9550(ah)) {
+        if (AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                 /*
                  * AR955x has tempSlope register for each chain.
                  * Check whether temp_compensation feature is enabled or not.
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 29613ebbc5d7..ec1da0cc25f5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -28,6 +28,7 @@
 #include "ar9462_2p1_initvals.h"
 #include "ar9565_1p0_initvals.h"
 #include "ar9565_1p1_initvals.h"
+#include "ar953x_initvals.h"
 
 /* General hardware code for the AR9003 hadware family */
 
@@ -308,6 +309,31 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 /* Fast clock modal settings */
                 INIT_INI_ARRAY(&ah->iniModesFastClock,
                                 ar955x_1p0_modes_fast_clock);
+        } else if (AR_SREV_9531(ah)) {
+                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
+                               qca953x_1p0_mac_core);
+                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
+                               qca953x_1p0_mac_postamble);
+                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
+                               qca953x_1p0_baseband_core);
+                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
+                               qca953x_1p0_baseband_postamble);
+                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
+                               qca953x_1p0_radio_core);
+                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
+                               qca953x_1p0_radio_postamble);
+                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
+                               qca953x_1p0_soc_preamble);
+                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
+                               qca953x_1p0_soc_postamble);
+                INIT_INI_ARRAY(&ah->iniModesRxGain,
+                               qca953x_1p0_common_wo_xlna_rx_gain_table);
+                INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
+                               qca953x_1p0_common_wo_xlna_rx_gain_bounds);
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                               qca953x_1p0_modes_no_xpa_tx_gain_table);
+                INIT_INI_ARRAY(&ah->iniModesFastClock,
+                               qca953x_1p0_modes_fast_clock);
         } else if (AR_SREV_9580(ah)) {
                 /* mac */
                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
@@ -485,6 +511,9 @@ static void ar9003_tx_gain_table_mode0(struct ath_hw *ah)
         else if (AR_SREV_9550(ah))
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                         ar955x_1p0_modes_xpa_tx_gain_table);
+        else if (AR_SREV_9531(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        qca953x_1p0_modes_xpa_tx_gain_table);
         else if (AR_SREV_9580(ah))
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                         ar9580_1p0_lowest_ob_db_tx_gain_table);
@@ -525,7 +554,14 @@ static void ar9003_tx_gain_table_mode1(struct ath_hw *ah)
         else if (AR_SREV_9550(ah))
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                         ar955x_1p0_modes_no_xpa_tx_gain_table);
-        else if (AR_SREV_9462_21(ah))
+        else if (AR_SREV_9531(ah)) {
+                if (AR_SREV_9531_11(ah))
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       qca953x_1p1_modes_no_xpa_tx_gain_table);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       qca953x_1p0_modes_no_xpa_tx_gain_table);
+        } else if (AR_SREV_9462_21(ah))
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                         ar9462_2p1_modes_high_ob_db_tx_gain);
         else if (AR_SREV_9462_20(ah))
@@ -699,6 +735,11 @@ static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
                                 ar955x_1p0_common_rx_gain_table);
                 INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
                                 ar955x_1p0_common_rx_gain_bounds);
+        } else if (AR_SREV_9531(ah)) {
+                INIT_INI_ARRAY(&ah->iniModesRxGain,
+                               qca953x_1p0_common_rx_gain_table);
+                INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
+                               qca953x_1p0_common_rx_gain_bounds);
         } else if (AR_SREV_9580(ah))
                 INIT_INI_ARRAY(&ah->iniModesRxGain,
                                 ar9580_1p0_rx_gain_table);
@@ -744,6 +785,11 @@ static void ar9003_rx_gain_table_mode1(struct ath_hw *ah)
                         ar955x_1p0_common_wo_xlna_rx_gain_table);
                 INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
                         ar955x_1p0_common_wo_xlna_rx_gain_bounds);
+        } else if (AR_SREV_9531(ah)) {
+                INIT_INI_ARRAY(&ah->iniModesRxGain,
+                               qca953x_1p0_common_wo_xlna_rx_gain_table);
+                INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
+                               qca953x_1p0_common_wo_xlna_rx_gain_bounds);
         } else if (AR_SREV_9580(ah))
                 INIT_INI_ARRAY(&ah->iniModesRxGain,
                         ar9580_1p0_wo_xlna_rx_gain_table);
@@ -872,6 +918,117 @@ static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
         }
 }
 
+static void ar9003_hw_init_hang_checks(struct ath_hw *ah)
+{
+        /*
+         * All chips support detection of BB/MAC hangs.
+         */
+        ah->config.hw_hang_checks |= HW_BB_WATCHDOG;
+        ah->config.hw_hang_checks |= HW_MAC_HANG;
+
+        /*
+         * This is not required for AR9580 1.0
+         */
+        if (AR_SREV_9300_22(ah))
+                ah->config.hw_hang_checks |= HW_PHYRESTART_CLC_WAR;
+
+        if (AR_SREV_9330(ah))
+                ah->bb_watchdog_timeout_ms = 85;
+        else
+                ah->bb_watchdog_timeout_ms = 25;
+}
+
+/*
+ * MAC HW hang check
+ * =================
+ *
+ * Signature: dcu_chain_state is 0x6 and dcu_complete_state is 0x1.
+ *
+ * The state of each DCU chain (mapped to TX queues) is available from these
+ * DMA debug registers:
+ *
+ * Chain 0 state : Bits 4:0   of AR_DMADBG_4
+ * Chain 1 state : Bits 9:5   of AR_DMADBG_4
+ * Chain 2 state : Bits 14:10 of AR_DMADBG_4
+ * Chain 3 state : Bits 19:15 of AR_DMADBG_4
+ * Chain 4 state : Bits 24:20 of AR_DMADBG_4
+ * Chain 5 state : Bits 29:25 of AR_DMADBG_4
+ * Chain 6 state : Bits 4:0   of AR_DMADBG_5
+ * Chain 7 state : Bits 9:5   of AR_DMADBG_5
+ * Chain 8 state : Bits 14:10 of AR_DMADBG_5
+ * Chain 9 state : Bits 19:15 of AR_DMADBG_5
+ *
+ * The DCU chain state "0x6" means "WAIT_FRDONE" - wait for TX frame to be done.
+ */
+
+#define NUM_STATUS_READS 50
+
+static bool ath9k_hw_verify_hang(struct ath_hw *ah, unsigned int queue)
+{
+        u32 dma_dbg_chain, dma_dbg_complete;
+        u8 dcu_chain_state, dcu_complete_state;
+        int i;
+
+        for (i = 0; i < NUM_STATUS_READS; i++) {
+                if (queue < 6)
+                        dma_dbg_chain = REG_READ(ah, AR_DMADBG_4);
+                else
+                        dma_dbg_chain = REG_READ(ah, AR_DMADBG_5);
+
+                dma_dbg_complete = REG_READ(ah, AR_DMADBG_6);
+
+                dcu_chain_state = (dma_dbg_chain >> (5 * queue)) & 0x1f;
+                dcu_complete_state = dma_dbg_complete & 0x3;
+
+                if ((dcu_chain_state != 0x6) || (dcu_complete_state != 0x1))
+                        return false;
+        }
+
+        ath_dbg(ath9k_hw_common(ah), RESET,
+                "MAC Hang signature found for queue: %d\n", queue);
+
+        return true;
+}
+
+static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)
+{
+        u32 dma_dbg_4, dma_dbg_5, dma_dbg_6, chk_dbg;
+        u8 dcu_chain_state, dcu_complete_state;
+        bool dcu_wait_frdone = false;
+        unsigned long chk_dcu = 0;
+        unsigned int i = 0;
+
+        dma_dbg_4 = REG_READ(ah, AR_DMADBG_4);
+        dma_dbg_5 = REG_READ(ah, AR_DMADBG_5);
+        dma_dbg_6 = REG_READ(ah, AR_DMADBG_6);
+
+        dcu_complete_state = dma_dbg_6 & 0x3;
+        if (dcu_complete_state != 0x1)
+                goto exit;
+
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+                if (i < 6)
+                        chk_dbg = dma_dbg_4;
+                else
+                        chk_dbg = dma_dbg_5;
+
+                dcu_chain_state = (chk_dbg >> (5 * i)) & 0x1f;
+                if (dcu_chain_state == 0x6) {
+                        dcu_wait_frdone = true;
+                        chk_dcu |= BIT(i);
+                }
+        }
+
+        if ((dcu_complete_state == 0x1) && dcu_wait_frdone) {
+                for_each_set_bit(i, &chk_dcu, ATH9K_NUM_TX_QUEUES) {
+                        if (ath9k_hw_verify_hang(ah, i))
+                                return true;
+                }
+        }
+exit:
+        return false;
+}
+
 /* Sets up the AR9003 hardware familiy callbacks */
 void ar9003_hw_attach_ops(struct ath_hw *ah)
 {
@@ -880,6 +1037,8 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
 
         ar9003_hw_init_mode_regs(ah);
         priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
+        priv_ops->init_hang_checks = ar9003_hw_init_hang_checks;
+        priv_ops->detect_mac_hang = ar9003_hw_detect_mac_hang;
 
         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 9f051a08e143..09facba1dc6d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -103,7 +103,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
                         } else {
                                 channelSel = CHANSEL_2G(freq) >> 1;
                         }
-                } else if (AR_SREV_9550(ah)) {
+                } else if (AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                         if (ah->is_clk_25mhz)
                                 div = 75;
                         else
@@ -118,7 +118,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
                 /* Set to 2G mode */
                 bMode = 1;
         } else {
-                if ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) &&
+                if ((AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah)) &&
                     ah->is_clk_25mhz) {
                         channelSel = freq / 75;
                         chan_frac = ((freq % 75) * 0x20000) / 75;
@@ -810,10 +810,12 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
         /*
          * TXGAIN initvals.
          */
-        if (AR_SREV_9550(ah)) {
-                int modes_txgain_index;
+        if (AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
+                int modes_txgain_index = 1;
+
+                if (AR_SREV_9550(ah))
+                        modes_txgain_index = ar9550_hw_get_modes_txgain_index(ah, chan);
 
-                modes_txgain_index = ar9550_hw_get_modes_txgain_index(ah, chan);
                 if (modes_txgain_index < 0)
                         return -EINVAL;
 
@@ -1814,6 +1816,68 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
         memcpy(ah->nf_regs, ar9300_cca_regs, sizeof(ah->nf_regs));
 }
 
+/*
+ * Baseband Watchdog signatures:
+ *
+ * 0x04000539: BB hang when operating in HT40 DFS Channel.
+ *             Full chip reset is not required, but a recovery
+ *             mechanism is needed.
+ *
+ * 0x1300000a: Related to CAC deafness.
+ *             Chip reset is not required.
+ *
+ * 0x0400000a: Related to CAC deafness.
+ *             Full chip reset is required.
+ *
+ * 0x04000b09: RX state machine gets into an illegal state
+ *             when a packet with unsupported rate is received.
+ *             Full chip reset is required and PHY_RESTART has
+ *             to be disabled.
+ *
+ * 0x04000409: Packet stuck on receive.
+ *             Full chip reset is required for all chips except AR9340.
+ */
+
+/*
+ * ar9003_hw_bb_watchdog_check(): Returns true if a chip reset is required.
+ */
+bool ar9003_hw_bb_watchdog_check(struct ath_hw *ah)
+{
+        u32 val;
+
+        switch(ah->bb_watchdog_last_status) {
+        case 0x04000539:
+                val = REG_READ(ah, AR_PHY_RADAR_0);
+                val &= (~AR_PHY_RADAR_0_FIRPWR);
+                val |= SM(0x7f, AR_PHY_RADAR_0_FIRPWR);
+                REG_WRITE(ah, AR_PHY_RADAR_0, val);
+                udelay(1);
+                val = REG_READ(ah, AR_PHY_RADAR_0);
+                val &= ~AR_PHY_RADAR_0_FIRPWR;
+                val |= SM(AR9300_DFS_FIRPWR, AR_PHY_RADAR_0_FIRPWR);
+                REG_WRITE(ah, AR_PHY_RADAR_0, val);
+
+                return false;
+        case 0x1300000a:
+                return false;
+        case 0x0400000a:
+        case 0x04000b09:
+                return true;
+        case 0x04000409:
+                if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
+                        return false;
+                else
+                        return true;
+        default:
+                /*
+                 * For any other unknown signatures, do a
+                 * full chip reset.
+                 */
+                return true;
+        }
+}
+EXPORT_SYMBOL(ar9003_hw_bb_watchdog_check);
+
 void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
@@ -1930,6 +1994,7 @@ EXPORT_SYMBOL(ar9003_hw_bb_watchdog_dbg_info);
 
 void ar9003_hw_disable_phy_restart(struct ath_hw *ah)
 {
+        u8 result;
         u32 val;
 
         /* While receiving unsupported rate frame rx state machine
@@ -1937,15 +2002,13 @@ void ar9003_hw_disable_phy_restart(struct ath_hw *ah)
          * state, BB would go hang. If RXSM is in 0xb state after
          * first bb panic, ensure to disable the phy_restart.
          */
-        if (!((MS(ah->bb_watchdog_last_status,
-                  AR_PHY_WATCHDOG_RX_OFDM_SM) == 0xb) ||
-            ah->bb_hang_rx_ofdm))
-                return;
-
-        ah->bb_hang_rx_ofdm = true;
-        val = REG_READ(ah, AR_PHY_RESTART);
-        val &= ~AR_PHY_RESTART_ENA;
+        result = MS(ah->bb_watchdog_last_status, AR_PHY_WATCHDOG_RX_OFDM_SM);
 
-        REG_WRITE(ah, AR_PHY_RESTART, val);
+        if ((result == 0xb) || ah->bb_hang_rx_ofdm) {
+                ah->bb_hang_rx_ofdm = true;
+                val = REG_READ(ah, AR_PHY_RESTART);
+                val &= ~AR_PHY_RESTART_ENA;
+                REG_WRITE(ah, AR_PHY_RESTART, val);
+        }
 }
 EXPORT_SYMBOL(ar9003_hw_disable_phy_restart);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 1b441715ba39..fd090b1f2d0f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -338,9 +338,8 @@
 #define AR_PHY_CCA_NOM_VAL_9300_5GHZ          -115
 #define AR_PHY_CCA_MIN_GOOD_VAL_9300_2GHZ     -125
 #define AR_PHY_CCA_MIN_GOOD_VAL_9300_5GHZ     -125
-#define AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ     -95
-#define AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ     -100
-
+#define AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ     -60
+#define AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ     -60
 #define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_2GHZ -95
 #define AR_PHY_CCA_MAX_GOOD_VAL_9300_FCC_5GHZ -100
 
@@ -670,6 +669,16 @@
 #define AR_PHY_65NM_CH1_RXTX4       0x1650c
 #define AR_PHY_65NM_CH2_RXTX4       0x1690c
 
+#define AR_PHY_65NM_CH0_BB1         0x16140
+#define AR_PHY_65NM_CH0_BB2         0x16144
+#define AR_PHY_65NM_CH0_BB3         0x16148
+#define AR_PHY_65NM_CH1_BB1         0x16540
+#define AR_PHY_65NM_CH1_BB2         0x16544
+#define AR_PHY_65NM_CH1_BB3         0x16548
+#define AR_PHY_65NM_CH2_BB1         0x16940
+#define AR_PHY_65NM_CH2_BB2         0x16944
+#define AR_PHY_65NM_CH2_BB3         0x16948
+
 #define AR_PHY_65NM_CH0_SYNTH12_VREFMUL3           0x00780000
 #define AR_PHY_65NM_CH0_SYNTH12_VREFMUL3_S         19
 #define AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK         0x00000004
@@ -1334,4 +1343,6 @@
 #define AR_PHY_65NM_RXRF_AGC_AGC_OUT                   0x00000004
 #define AR_PHY_65NM_RXRF_AGC_AGC_OUT_S                 2
 
+#define AR9300_DFS_FIRPWR -28
+
 #endif  /* AR9003_PHY_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
new file mode 100644
index 000000000000..3c9113d9b1bc
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
@@ -0,0 +1,718 @@
+/*
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef INITVALS_953X_H
+#define INITVALS_953X_H
+
+#define qca953x_1p0_mac_postamble ar9300_2p2_mac_postamble
+
+#define qca953x_1p0_soc_postamble ar9300_2p2_soc_postamble
+
+#define qca953x_1p0_common_rx_gain_table ar9300Common_rx_gain_table_2p2
+
+#define qca953x_1p0_common_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2
+
+#define qca953x_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2
+
+static const u32 qca953x_1p0_mac_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00000008, 0x00000000},
+        {0x00000030, 0x00020085},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000000},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x000010f0, 0x00000100},
+        {0x00001270, 0x00000000},
+        {0x000012b0, 0x00000000},
+        {0x000012f0, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00008000, 0x00000000},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000000},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008040, 0x00000000},
+        {0x00008044, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x0000804c, 0xffffffff},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000310},
+        {0x00008074, 0x00000020},
+        {0x00008078, 0x00000000},
+        {0x0000809c, 0x0000000f},
+        {0x000080a0, 0x00000000},
+        {0x000080a4, 0x02ff0000},
+        {0x000080a8, 0x0e070605},
+        {0x000080ac, 0x0000000d},
+        {0x000080b0, 0x00000000},
+        {0x000080b4, 0x00000000},
+        {0x000080b8, 0x00000000},
+        {0x000080bc, 0x00000000},
+        {0x000080c0, 0x2a800000},
+        {0x000080c4, 0x06900168},
+        {0x000080c8, 0x13881c22},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00252500},
+        {0x000080d4, 0x00a00000},
+        {0x000080d8, 0x00400000},
+        {0x000080dc, 0x00000000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x3f3f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00000000},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000000},
+        {0x00008114, 0x000007ff},
+        {0x00008118, 0x000000aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x0000ffff},
+        {0x00008140, 0x000000fe},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x000081c0, 0x00000000},
+        {0x000081c4, 0x33332210},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f3d7},
+        {0x00008248, 0x00000852},
+        {0x0000824c, 0x0001e7ae},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x40000000},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x9d400010},
+        {0x00008268, 0xffffffff},
+        {0x0000826c, 0x0000ffff},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000004},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x000000ff},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00001d40},
+        {0x00008314, 0x00000000},
+        {0x0000831c, 0x0000010d},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x0000001f},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000700},
+        {0x00008338, 0xffff0000},
+        {0x0000833c, 0x02400000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0xaa48107b},
+        {0x00008348, 0x008f0000},
+        {0x0000835c, 0x00000000},
+        {0x00008360, 0xffffffff},
+        {0x00008364, 0xffffffff},
+        {0x00008368, 0x00000000},
+        {0x00008370, 0x00000000},
+        {0x00008374, 0x000000ff},
+        {0x00008378, 0x00000000},
+        {0x0000837c, 0x00000000},
+        {0x00008380, 0xffffffff},
+        {0x00008384, 0xffffffff},
+        {0x00008390, 0xffffffff},
+        {0x00008394, 0xffffffff},
+        {0x00008398, 0x00000000},
+        {0x0000839c, 0x00000000},
+        {0x000083a0, 0x00000000},
+        {0x000083a4, 0x0000fa14},
+        {0x000083a8, 0x000f0c00},
+        {0x000083ac, 0x33332210},
+        {0x000083b0, 0x33332210},
+        {0x000083b4, 0x33332210},
+        {0x000083b8, 0x33332210},
+        {0x000083bc, 0x00000000},
+        {0x000083c0, 0x00000000},
+        {0x000083c4, 0x00000000},
+        {0x000083c8, 0x00000000},
+        {0x000083cc, 0x00000200},
+        {0x000083d0, 0x8c7901ff},
+};
+
+static const u32 qca953x_1p0_baseband_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00009800, 0xafe68e30},
+        {0x00009804, 0xfd14e000},
+        {0x00009808, 0x9c0a9f6b},
+        {0x0000980c, 0x04900000},
+        {0x00009814, 0x0280c00a},
+        {0x00009818, 0x00000000},
+        {0x0000981c, 0x00020028},
+        {0x00009834, 0x6400a190},
+        {0x00009838, 0x0108ecff},
+        {0x0000983c, 0x14000600},
+        {0x00009880, 0x201fff00},
+        {0x00009884, 0x00001042},
+        {0x000098a4, 0x00200400},
+        {0x000098b0, 0x32840bbe},
+        {0x000098bc, 0x00000002},
+        {0x000098d0, 0x004b6a8e},
+        {0x000098d4, 0x00000820},
+        {0x000098dc, 0x00000000},
+        {0x000098f0, 0x00000000},
+        {0x000098f4, 0x00000000},
+        {0x00009c04, 0xff55ff55},
+        {0x00009c08, 0x0320ff55},
+        {0x00009c0c, 0x00000000},
+        {0x00009c10, 0x00000000},
+        {0x00009c14, 0x00046384},
+        {0x00009c18, 0x05b6b440},
+        {0x00009c1c, 0x00b6b440},
+        {0x00009d00, 0xc080a333},
+        {0x00009d04, 0x40206c10},
+        {0x00009d08, 0x009c4060},
+        {0x00009d0c, 0x9883800a},
+        {0x00009d10, 0x01884061},
+        {0x00009d14, 0x00c0040b},
+        {0x00009d18, 0x00000000},
+        {0x00009e08, 0x0038230c},
+        {0x00009e24, 0x990bb515},
+        {0x00009e28, 0x0c6f0000},
+        {0x00009e30, 0x06336f77},
+        {0x00009e34, 0x6af6532f},
+        {0x00009e38, 0x0cc80c00},
+        {0x00009e40, 0x0d261820},
+        {0x00009e4c, 0x00001004},
+        {0x00009e50, 0x00ff03f1},
+        {0x00009fc0, 0x813e4788},
+        {0x00009fc4, 0x0001efb5},
+        {0x00009fcc, 0x40000014},
+        {0x00009fd0, 0x01193b91},
+        {0x0000a20c, 0x00000000},
+        {0x0000a220, 0x00000000},
+        {0x0000a224, 0x00000000},
+        {0x0000a228, 0x10002310},
+        {0x0000a23c, 0x00000000},
+        {0x0000a244, 0x0c000000},
+        {0x0000a248, 0x00000140},
+        {0x0000a2a0, 0x00000007},
+        {0x0000a2c0, 0x00000007},
+        {0x0000a2c8, 0x00000000},
+        {0x0000a2d4, 0x00000000},
+        {0x0000a2ec, 0x00000000},
+        {0x0000a2f0, 0x00000000},
+        {0x0000a2f4, 0x00000000},
+        {0x0000a2f8, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a34c, 0x00000000},
+        {0x0000a350, 0x0000a000},
+        {0x0000a364, 0x00000000},
+        {0x0000a370, 0x00000000},
+        {0x0000a390, 0x00000001},
+        {0x0000a394, 0x00000444},
+        {0x0000a398, 0x1f020503},
+        {0x0000a39c, 0x29180c03},
+        {0x0000a3a0, 0x9a8b6844},
+        {0x0000a3a4, 0x000000ff},
+        {0x0000a3a8, 0x6a6a6a6a},
+        {0x0000a3ac, 0x6a6a6a6a},
+        {0x0000a3b0, 0x00c8641a},
+        {0x0000a3b4, 0x0000001a},
+        {0x0000a3b8, 0x0088642a},
+        {0x0000a3bc, 0x000001fa},
+        {0x0000a3c0, 0x20202020},
+        {0x0000a3c4, 0x22222220},
+        {0x0000a3c8, 0x20200020},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3d8, 0x20202020},
+        {0x0000a3dc, 0x20202020},
+        {0x0000a3e0, 0x20202020},
+        {0x0000a3e4, 0x20202020},
+        {0x0000a3e8, 0x20202020},
+        {0x0000a3ec, 0x20202020},
+        {0x0000a3f0, 0x00000000},
+        {0x0000a3f4, 0x00000000},
+        {0x0000a3f8, 0x0c9bd380},
+        {0x0000a3fc, 0x000f0f01},
+        {0x0000a400, 0x8fa91f01},
+        {0x0000a404, 0x00000000},
+        {0x0000a408, 0x0e79e5c6},
+        {0x0000a40c, 0x00820820},
+        {0x0000a414, 0x1ce42108},
+        {0x0000a418, 0x2d001dce},
+        {0x0000a41c, 0x1ce73908},
+        {0x0000a420, 0x000001ce},
+        {0x0000a424, 0x1ce738e7},
+        {0x0000a428, 0x000001ce},
+        {0x0000a42c, 0x1ce739ce},
+        {0x0000a430, 0x1ce739ce},
+        {0x0000a434, 0x00000000},
+        {0x0000a438, 0x00001801},
+        {0x0000a43c, 0x00100000},
+        {0x0000a444, 0x00000000},
+        {0x0000a448, 0x05000080},
+        {0x0000a44c, 0x00000001},
+        {0x0000a450, 0x00010000},
+        {0x0000a458, 0x00000000},
+        {0x0000a644, 0xbfad9d74},
+        {0x0000a648, 0x0048060a},
+        {0x0000a64c, 0x00003c37},
+        {0x0000a670, 0x03020100},
+        {0x0000a674, 0x09080504},
+        {0x0000a678, 0x0d0c0b0a},
+        {0x0000a67c, 0x13121110},
+        {0x0000a680, 0x31301514},
+        {0x0000a684, 0x35343332},
+        {0x0000a688, 0x00000036},
+        {0x0000a690, 0x08000838},
+        {0x0000a7cc, 0x00000000},
+        {0x0000a7d0, 0x00000000},
+        {0x0000a7d4, 0x00000004},
+        {0x0000a7dc, 0x00000000},
+        {0x0000a8d0, 0x004b6a8e},
+        {0x0000a8d4, 0x00000820},
+        {0x0000a8dc, 0x00000000},
+        {0x0000a8f0, 0x00000000},
+        {0x0000a8f4, 0x00000000},
+        {0x0000b2d0, 0x00000080},
+        {0x0000b2d4, 0x00000000},
+        {0x0000b2ec, 0x00000000},
+        {0x0000b2f0, 0x00000000},
+        {0x0000b2f4, 0x00000000},
+        {0x0000b2f8, 0x00000000},
+        {0x0000b408, 0x0e79e5c0},
+        {0x0000b40c, 0x00820820},
+        {0x0000b420, 0x00000000},
+};
+
+static const u32 qca953x_1p0_baseband_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
+        {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
+        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
+        {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
+        {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
+        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
+        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
+        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e3c, 0xcfa10820, 0xcfa10820, 0xcfa10822, 0xcfa10822},
+        {0x00009e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
+        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
+        {0x0000a204, 0x005c0ec0, 0x005c0ec4, 0x005c0ec4, 0x005c0ec0},
+        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
+        {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+        {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, 0x01010e0e, 0x01010e0e},
+        {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
+        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
+        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+        {0x0000a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+        {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+        {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+        {0x0000a2cc, 0x18c50033, 0x18c43433, 0x18c41033, 0x18c44c33},
+        {0x0000a2d0, 0x00041982, 0x00041982, 0x00041982, 0x00041982},
+        {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
+        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+        {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
+        {0x0000b284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+};
+
+static const u32 qca953x_1p0_radio_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00016000, 0x36db6db6},
+        {0x00016004, 0x6db6db40},
+        {0x00016008, 0x73f00000},
+        {0x0001600c, 0x00000000},
+        {0x00016040, 0x3f80fff8},
+        {0x0001604c, 0x000f0278},
+        {0x00016050, 0x8036db6c},
+        {0x00016054, 0x6db60000},
+        {0x00016080, 0x00080000},
+        {0x00016084, 0x0e48048c},
+        {0x00016088, 0x14214514},
+        {0x0001608c, 0x119f080a},
+        {0x00016090, 0x24926490},
+        {0x00016094, 0x00000000},
+        {0x000160a0, 0xc2108ffe},
+        {0x000160a4, 0x812fc370},
+        {0x000160a8, 0x423c8000},
+        {0x000160b4, 0x92480080},
+        {0x000160c0, 0x006db6d8},
+        {0x000160c4, 0x24b6db6c},
+        {0x000160c8, 0x6db6db6c},
+        {0x000160cc, 0x6db6fb7c},
+        {0x000160d0, 0x6db6da44},
+        {0x00016100, 0x07ff8001},
+        {0x00016108, 0x00080010},
+        {0x00016144, 0x01884080},
+        {0x00016148, 0x000080d8},
+        {0x00016280, 0x01000901},
+        {0x00016284, 0x15d30000},
+        {0x00016288, 0x00318000},
+        {0x0001628c, 0x50000000},
+        {0x00016380, 0x00000000},
+        {0x00016384, 0x00000000},
+        {0x00016388, 0x00800700},
+        {0x0001638c, 0x00800700},
+        {0x00016390, 0x00800700},
+        {0x00016394, 0x00000000},
+        {0x00016398, 0x00000000},
+        {0x0001639c, 0x00000000},
+        {0x000163a0, 0x00000001},
+        {0x000163a4, 0x00000001},
+        {0x000163a8, 0x00000000},
+        {0x000163ac, 0x00000000},
+        {0x000163b0, 0x00000000},
+        {0x000163b4, 0x00000000},
+        {0x000163b8, 0x00000000},
+        {0x000163bc, 0x00000000},
+        {0x000163c0, 0x000000a0},
+        {0x000163c4, 0x000c0000},
+        {0x000163c8, 0x14021402},
+        {0x000163cc, 0x00001402},
+        {0x000163d0, 0x00000000},
+        {0x000163d4, 0x00000000},
+        {0x00016400, 0x36db6db6},
+        {0x00016404, 0x6db6db40},
+        {0x00016408, 0x73f00000},
+        {0x0001640c, 0x00000000},
+        {0x00016440, 0x3f80fff8},
+        {0x0001644c, 0x000f0278},
+        {0x00016450, 0x8036db6c},
+        {0x00016454, 0x6db60000},
+        {0x00016500, 0x07ff8001},
+        {0x00016508, 0x00080010},
+        {0x00016544, 0x01884080},
+        {0x00016548, 0x000080d8},
+        {0x00016780, 0x00000000},
+        {0x00016784, 0x00000000},
+        {0x00016788, 0x00800700},
+        {0x0001678c, 0x00800700},
+        {0x00016790, 0x00800700},
+        {0x00016794, 0x00000000},
+        {0x00016798, 0x00000000},
+        {0x0001679c, 0x00000000},
+        {0x000167a0, 0x00000001},
+        {0x000167a4, 0x00000001},
+        {0x000167a8, 0x00000000},
+        {0x000167ac, 0x00000000},
+        {0x000167b0, 0x00000000},
+        {0x000167b4, 0x00000000},
+        {0x000167b8, 0x00000000},
+        {0x000167bc, 0x00000000},
+        {0x000167c0, 0x000000a0},
+        {0x000167c4, 0x000c0000},
+        {0x000167c8, 0x14021402},
+        {0x000167cc, 0x00001402},
+        {0x000167d0, 0x00000000},
+        {0x000167d4, 0x00000000},
+};
+
+static const u32 qca953x_1p0_radio_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xc4128f5c, 0xc4128f5c},
+        {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x0fd08f25, 0x0fd08f25},
+        {0x000160ac, 0xa4647c00, 0xa4647c00, 0x24646800, 0x24646800},
+        {0x000160b0, 0x01885f52, 0x01885f52, 0x00fe7f46, 0x00fe7f46},
+        {0x00016104, 0xb7a00001, 0xb7a00001, 0xfff80005, 0xfff80005},
+        {0x0001610c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+        {0x00016140, 0x10804008, 0x10804008, 0x50804000, 0x50804000},
+        {0x00016504, 0xb7a00001, 0xb7a00001, 0xfff80001, 0xfff80001},
+        {0x0001650c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+        {0x00016540, 0x10804008, 0x10804008, 0x50804000, 0x50804000},
+};
+
+static const u32 qca953x_1p0_soc_preamble[][2] = {
+        /* Addr      allmodes  */
+        {0x00007000, 0x00000000},
+        {0x00007004, 0x00000000},
+        {0x00007008, 0x00000000},
+        {0x0000700c, 0x00000000},
+        {0x0000701c, 0x00000000},
+        {0x00007020, 0x00000000},
+        {0x00007024, 0x00000000},
+        {0x00007028, 0x00000000},
+        {0x0000702c, 0x00000000},
+        {0x00007030, 0x00000000},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00007048, 0x00000000},
+};
+
+static const u32 qca953x_1p0_common_rx_gain_bounds[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302018, 0x50302018},
+};
+
+static const u32 qca953x_1p0_common_wo_xlna_rx_gain_bounds[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
+};
+
+static const u32 qca953x_1p0_modes_xpa_tx_gain_table[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a2dc, 0xfffd5aaa},
+        {0x0000a2e0, 0xfffe9ccc},
+        {0x0000a2e4, 0xffffe0f0},
+        {0x0000a2e8, 0xfffcff00},
+        {0x0000a410, 0x000050da},
+        {0x0000a500, 0x00000000},
+        {0x0000a504, 0x04000002},
+        {0x0000a508, 0x08000004},
+        {0x0000a50c, 0x0c000006},
+        {0x0000a510, 0x0f00000a},
+        {0x0000a514, 0x1300000c},
+        {0x0000a518, 0x1700000e},
+        {0x0000a51c, 0x1b000064},
+        {0x0000a520, 0x1f000242},
+        {0x0000a524, 0x23000229},
+        {0x0000a528, 0x270002a2},
+        {0x0000a52c, 0x2c001203},
+        {0x0000a530, 0x30001803},
+        {0x0000a534, 0x33000881},
+        {0x0000a538, 0x38001809},
+        {0x0000a53c, 0x3a000814},
+        {0x0000a540, 0x3f001a0c},
+        {0x0000a544, 0x43001a0e},
+        {0x0000a548, 0x46001812},
+        {0x0000a54c, 0x49001884},
+        {0x0000a550, 0x4d001e84},
+        {0x0000a554, 0x50001e69},
+        {0x0000a558, 0x550006f4},
+        {0x0000a55c, 0x59000ad3},
+        {0x0000a560, 0x5e000ad5},
+        {0x0000a564, 0x61001ced},
+        {0x0000a568, 0x660018d4},
+        {0x0000a56c, 0x660018d4},
+        {0x0000a570, 0x660018d4},
+        {0x0000a574, 0x660018d4},
+        {0x0000a578, 0x660018d4},
+        {0x0000a57c, 0x660018d4},
+        {0x0000a600, 0x00000000},
+        {0x0000a604, 0x00000000},
+        {0x0000a608, 0x00000000},
+        {0x0000a60c, 0x03804000},
+        {0x0000a610, 0x0300ca02},
+        {0x0000a614, 0x00000e04},
+        {0x0000a618, 0x03014000},
+        {0x0000a61c, 0x00000000},
+        {0x0000a620, 0x00000000},
+        {0x0000a624, 0x03014000},
+        {0x0000a628, 0x03804c05},
+        {0x0000a62c, 0x0701de06},
+        {0x0000a630, 0x07819c07},
+        {0x0000a634, 0x0701dc07},
+        {0x0000a638, 0x0701dc07},
+        {0x0000a63c, 0x0701dc07},
+        {0x0000b2dc, 0xfffd5aaa},
+        {0x0000b2e0, 0xfffe9ccc},
+        {0x0000b2e4, 0xffffe0f0},
+        {0x0000b2e8, 0xfffcff00},
+        {0x00016044, 0x010002d4},
+        {0x00016048, 0x66482400},
+        {0x00016280, 0x01000015},
+        {0x00016444, 0x010002d4},
+        {0x00016448, 0x66482400},
+};
+
+static const u32 qca953x_1p0_modes_no_xpa_tx_gain_table[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a2dc, 0xffd5f552},
+        {0x0000a2e0, 0xffe60664},
+        {0x0000a2e4, 0xfff80780},
+        {0x0000a2e8, 0xfffff800},
+        {0x0000a410, 0x000050d6},
+        {0x0000a500, 0x00060020},
+        {0x0000a504, 0x04060060},
+        {0x0000a508, 0x080600a0},
+        {0x0000a50c, 0x0c068020},
+        {0x0000a510, 0x10068060},
+        {0x0000a514, 0x140680a0},
+        {0x0000a518, 0x18090040},
+        {0x0000a51c, 0x1b090080},
+        {0x0000a520, 0x1f0900c0},
+        {0x0000a524, 0x240c0041},
+        {0x0000a528, 0x280d0021},
+        {0x0000a52c, 0x2d0f0061},
+        {0x0000a530, 0x310f00a1},
+        {0x0000a534, 0x350e00a2},
+        {0x0000a538, 0x360e80a2},
+        {0x0000a53c, 0x380f00a2},
+        {0x0000a540, 0x3b0e00a3},
+        {0x0000a544, 0x3d110083},
+        {0x0000a548, 0x3e1100a3},
+        {0x0000a54c, 0x401100e3},
+        {0x0000a550, 0x421380e3},
+        {0x0000a554, 0x431780e3},
+        {0x0000a558, 0x461f80e3},
+        {0x0000a55c, 0x461f80e3},
+        {0x0000a560, 0x461f80e3},
+        {0x0000a564, 0x461f80e3},
+        {0x0000a568, 0x461f80e3},
+        {0x0000a56c, 0x461f80e3},
+        {0x0000a570, 0x461f80e3},
+        {0x0000a574, 0x461f80e3},
+        {0x0000a578, 0x461f80e3},
+        {0x0000a57c, 0x461f80e3},
+        {0x0000a600, 0x00000000},
+        {0x0000a604, 0x00000000},
+        {0x0000a608, 0x00000000},
+        {0x0000a60c, 0x00804201},
+        {0x0000a610, 0x01008201},
+        {0x0000a614, 0x0180c402},
+        {0x0000a618, 0x0180c603},
+        {0x0000a61c, 0x0180c603},
+        {0x0000a620, 0x01c10603},
+        {0x0000a624, 0x01c10704},
+        {0x0000a628, 0x02c18b05},
+        {0x0000a62c, 0x0301cc07},
+        {0x0000a630, 0x0301cc07},
+        {0x0000a634, 0x0301cc07},
+        {0x0000a638, 0x0301cc07},
+        {0x0000a63c, 0x0301cc07},
+        {0x0000b2dc, 0xffd5f552},
+        {0x0000b2e0, 0xffe60664},
+        {0x0000b2e4, 0xfff80780},
+        {0x0000b2e8, 0xfffff800},
+        {0x00016044, 0x049242db},
+        {0x00016048, 0x6c927a70},
+        {0x00016444, 0x049242db},
+        {0x00016448, 0x6c927a70},
+};
+
+static const u32 qca953x_1p1_modes_no_xpa_tx_gain_table[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a2dc, 0xffd5f552},
+        {0x0000a2e0, 0xffe60664},
+        {0x0000a2e4, 0xfff80780},
+        {0x0000a2e8, 0xfffff800},
+        {0x0000a410, 0x000050de},
+        {0x0000a500, 0x00000061},
+        {0x0000a504, 0x04000063},
+        {0x0000a508, 0x08000065},
+        {0x0000a50c, 0x0c000261},
+        {0x0000a510, 0x10000263},
+        {0x0000a514, 0x14000265},
+        {0x0000a518, 0x18000482},
+        {0x0000a51c, 0x1b000484},
+        {0x0000a520, 0x1f000486},
+        {0x0000a524, 0x240008c2},
+        {0x0000a528, 0x28000cc1},
+        {0x0000a52c, 0x2d000ce3},
+        {0x0000a530, 0x31000ce5},
+        {0x0000a534, 0x350010e5},
+        {0x0000a538, 0x360012e5},
+        {0x0000a53c, 0x380014e5},
+        {0x0000a540, 0x3b0018e5},
+        {0x0000a544, 0x3d001d04},
+        {0x0000a548, 0x3e001d05},
+        {0x0000a54c, 0x40001d07},
+        {0x0000a550, 0x42001f27},
+        {0x0000a554, 0x43001f67},
+        {0x0000a558, 0x46001fe7},
+        {0x0000a55c, 0x47001f2b},
+        {0x0000a560, 0x49001f0d},
+        {0x0000a564, 0x4b001ed2},
+        {0x0000a568, 0x4c001ed4},
+        {0x0000a56c, 0x4e001f15},
+        {0x0000a570, 0x4f001ff6},
+        {0x0000a574, 0x4f001ff6},
+        {0x0000a578, 0x4f001ff6},
+        {0x0000a57c, 0x4f001ff6},
+        {0x0000a600, 0x00000000},
+        {0x0000a604, 0x00000000},
+        {0x0000a608, 0x00000000},
+        {0x0000a60c, 0x00804201},
+        {0x0000a610, 0x01008201},
+        {0x0000a614, 0x0180c402},
+        {0x0000a618, 0x0180c603},
+        {0x0000a61c, 0x0180c603},
+        {0x0000a620, 0x01c10603},
+        {0x0000a624, 0x01c10704},
+        {0x0000a628, 0x02c18b05},
+        {0x0000a62c, 0x02c14c07},
+        {0x0000a630, 0x01008704},
+        {0x0000a634, 0x01c10402},
+        {0x0000a638, 0x0301cc07},
+        {0x0000a63c, 0x0301cc07},
+        {0x0000b2dc, 0xffd5f552},
+        {0x0000b2e0, 0xffe60664},
+        {0x0000b2e4, 0xfff80780},
+        {0x0000b2e8, 0xfffff800},
+        {0x00016044, 0x049242db},
+        {0x00016048, 0x6c927a70},
+        {0x00016444, 0x049242db},
+        {0x00016448, 0x6c927a70},
+};
+
+#endif /* INITVALS_953X_H */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index f2202e78fa7b..f622a986c8cc 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -455,10 +455,8 @@ bool ath9k_csa_is_finished(struct ath_softc *sc);
 
 void ath_tx_complete_poll_work(struct work_struct *work);
 void ath_reset_work(struct work_struct *work);
-void ath_hw_check(struct work_struct *work);
+bool ath_hw_check(struct ath_softc *sc);
 void ath_hw_pll_work(struct work_struct *work);
-void ath_rx_poll(unsigned long data);
-void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
 void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 void ath_start_ani(struct ath_softc *sc);
@@ -722,12 +720,10 @@ struct ath_softc {
         spinlock_t sc_pcu_lock;
         struct mutex mutex;
         struct work_struct paprd_work;
-        struct work_struct hw_check_work;
         struct work_struct hw_reset_work;
         struct completion paprd_complete;
         wait_queue_head_t tx_wait;
 
-        unsigned int hw_busy_count;
         unsigned long sc_flags;
         unsigned long driver_data;
 
@@ -761,7 +757,6 @@ struct ath_softc {
         struct ath_beacon_config cur_beacon_conf;
         struct delayed_work tx_complete_work;
         struct delayed_work hw_pll_work;
-        struct timer_list rx_poll_timer;
         struct timer_list sleep_timer;
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 112aff720e13..2e8bba0eb361 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -337,8 +337,14 @@ void ath9k_beacon_tasklet(unsigned long data)
 
                 ath9k_hw_check_nav(ah);
 
-                if (!ath9k_hw_check_alive(ah))
-                        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+                /*
+                 * If the previous beacon has not been transmitted
+                 * and a MAC/BB hang has been identified, return
+                 * here because a chip reset would have been
+                 * initiated.
+                 */
+                if (!ath_hw_check(sc))
+                        return;
 
                 if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
                         ath_dbg(common, BSTUCK,
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index c028df76b564..b41e008298dc 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -1077,7 +1077,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
 
         if (ieee80211_is_beacon(hdr->frame_control) &&
             !is_zero_ether_addr(common->curbssid) &&
-            ether_addr_equal(hdr->addr3, common->curbssid)) {
+            ether_addr_equal_64bits(hdr->addr3, common->curbssid)) {
                 s8 rssi = rxbuf->rxstatus.rs_rssi;
 
                 if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index cc58a8ee1223..a47ea8423f1e 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -107,6 +107,21 @@ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
 
 /* Private hardware call ops */
 
+static inline void ath9k_hw_init_hang_checks(struct ath_hw *ah)
+{
+        ath9k_hw_private_ops(ah)->init_hang_checks(ah);
+}
+
+static inline bool ath9k_hw_detect_mac_hang(struct ath_hw *ah)
+{
+        return ath9k_hw_private_ops(ah)->detect_mac_hang(ah);
+}
+
+static inline bool ath9k_hw_detect_bb_hang(struct ath_hw *ah)
+{
+        return ath9k_hw_private_ops(ah)->detect_bb_hang(ah);
+}
+
 /* PHY ops */
 
 static inline int ath9k_hw_rf_set_freq(struct ath_hw *ah,
@@ -232,4 +247,31 @@ static inline void ath9k_hw_set_radar_params(struct ath_hw *ah)
         ath9k_hw_private_ops(ah)->set_radar_params(ah, &ah->radar_conf);
 }
 
+static inline void ath9k_hw_init_cal_settings(struct ath_hw *ah)
+{
+        ath9k_hw_private_ops(ah)->init_cal_settings(ah);
+}
+
+static inline u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
+                                               struct ath9k_channel *chan)
+{
+        return ath9k_hw_private_ops(ah)->compute_pll_control(ah, chan);
+}
+
+static inline void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah)
+{
+        if (!ath9k_hw_private_ops(ah)->init_mode_gain_regs)
+                return;
+
+        ath9k_hw_private_ops(ah)->init_mode_gain_regs(ah);
+}
+
+static inline void ath9k_hw_ani_cache_ini_regs(struct ath_hw *ah)
+{
+        if (!ath9k_hw_private_ops(ah)->ani_cache_ini_regs)
+                return;
+
+        ath9k_hw_private_ops(ah)->ani_cache_ini_regs(ah);
+}
+
 #endif /* ATH9K_HW_OPS_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index a4b1ae026216..ce41658a6003 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -37,57 +37,6 @@ MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards.");
 MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
-static int __init ath9k_init(void)
-{
-        return 0;
-}
-module_init(ath9k_init);
-
-static void __exit ath9k_exit(void)
-{
-        return;
-}
-module_exit(ath9k_exit);
-
-/* Private hardware callbacks */
-
-static void ath9k_hw_init_cal_settings(struct ath_hw *ah)
-{
-        ath9k_hw_private_ops(ah)->init_cal_settings(ah);
-}
-
-static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
-                                        struct ath9k_channel *chan)
-{
-        return ath9k_hw_private_ops(ah)->compute_pll_control(ah, chan);
-}
-
-static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah)
-{
-        if (!ath9k_hw_private_ops(ah)->init_mode_gain_regs)
-                return;
-
-        ath9k_hw_private_ops(ah)->init_mode_gain_regs(ah);
-}
-
-static void ath9k_hw_ani_cache_ini_regs(struct ath_hw *ah)
-{
-        /* You will not have this callback if using the old ANI */
-        if (!ath9k_hw_private_ops(ah)->ani_cache_ini_regs)
-                return;
-
-        ath9k_hw_private_ops(ah)->ani_cache_ini_regs(ah);
-}
-
-/********************/
-/* Helper Functions */
-/********************/
-
-#ifdef CONFIG_ATH9K_DEBUGFS
-
-#endif
-
-
 static void ath9k_hw_set_clockrate(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
@@ -296,6 +245,9 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
         case AR9300_DEVID_QCA955X:
                 ah->hw_version.macVersion = AR_SREV_VERSION_9550;
                 return;
+        case AR9300_DEVID_AR953X:
+                ah->hw_version.macVersion = AR_SREV_VERSION_9531;
+                return;
         }
 
         val = REG_READ(ah, AR_SREV) & AR_SREV_ID;
@@ -397,9 +349,10 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah)
 
 static void ath9k_hw_init_config(struct ath_hw *ah)
 {
+        struct ath_common *common = ath9k_hw_common(ah);
+
         ah->config.dma_beacon_response_time = 1;
         ah->config.sw_beacon_response_time = 6;
-        ah->config.ack_6mb = 0x0;
         ah->config.cwm_ignore_extcca = 0;
         ah->config.analog_shiftreg = 1;
 
@@ -423,6 +376,24 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
          */
         if (num_possible_cpus() > 1)
                 ah->config.serialize_regmode = SER_REG_MODE_AUTO;
+
+        if (NR_CPUS > 1 && ah->config.serialize_regmode == SER_REG_MODE_AUTO) {
+                if (ah->hw_version.macVersion == AR_SREV_VERSION_5416_PCI ||
+                    ((AR_SREV_9160(ah) || AR_SREV_9280(ah) || AR_SREV_9287(ah)) &&
+                     !ah->is_pciexpress)) {
+                        ah->config.serialize_regmode = SER_REG_MODE_ON;
+                } else {
+                        ah->config.serialize_regmode = SER_REG_MODE_OFF;
+                }
+        }
+
+        ath_dbg(common, RESET, "serialize_regmode is %d\n",
+                ah->config.serialize_regmode);
+
+        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
+                ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1;
+        else
+                ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;
 }
 
 static void ath9k_hw_init_defaults(struct ath_hw *ah)
@@ -435,15 +406,24 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
         ah->hw_version.magic = AR5416_MAGIC;
         ah->hw_version.subvendorid = 0;
 
-        ah->sta_id1_defaults =
-                AR_STA_ID1_CRPT_MIC_ENABLE |
-                AR_STA_ID1_MCAST_KSRCH;
+        ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE |
+                               AR_STA_ID1_MCAST_KSRCH;
         if (AR_SREV_9100(ah))
                 ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX;
+
         ah->slottime = ATH9K_SLOT_TIME_9;
         ah->globaltxtimeout = (u32) -1;
         ah->power_mode = ATH9K_PM_UNDEFINED;
         ah->htc_reset_init = true;
+
+        ah->ani_function = ATH9K_ANI_ALL;
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
+
+        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
+                ah->tx_trig_level = (AR_FTRIG_256B >> AR_FTRIG_S);
+        else
+                ah->tx_trig_level = (AR_FTRIG_512B >> AR_FTRIG_S);
 }
 
 static int ath9k_hw_init_macaddr(struct ath_hw *ah)
@@ -525,6 +505,31 @@ static int __ath9k_hw_init(struct ath_hw *ah)
 
         ath9k_hw_read_revisions(ah);
 
+        switch (ah->hw_version.macVersion) {
+        case AR_SREV_VERSION_5416_PCI:
+        case AR_SREV_VERSION_5416_PCIE:
+        case AR_SREV_VERSION_9160:
+        case AR_SREV_VERSION_9100:
+        case AR_SREV_VERSION_9280:
+        case AR_SREV_VERSION_9285:
+        case AR_SREV_VERSION_9287:
+        case AR_SREV_VERSION_9271:
+        case AR_SREV_VERSION_9300:
+        case AR_SREV_VERSION_9330:
+        case AR_SREV_VERSION_9485:
+        case AR_SREV_VERSION_9340:
+        case AR_SREV_VERSION_9462:
+        case AR_SREV_VERSION_9550:
+        case AR_SREV_VERSION_9565:
+        case AR_SREV_VERSION_9531:
+                break;
+        default:
+                ath_err(common,
+                        "Mac Chip Rev 0x%02x.%x is not supported by this driver\n",
+                        ah->hw_version.macVersion, ah->hw_version.macRev);
+                return -EOPNOTSUPP;
+        }
+
         /*
          * Read back AR_WA into a permanent copy and set bits 14 and 17.
          * We need to do this to avoid RMW of this register. We cannot
@@ -558,50 +563,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
                 return -EIO;
         }
 
-        if (NR_CPUS > 1 && ah->config.serialize_regmode == SER_REG_MODE_AUTO) {
-                if (ah->hw_version.macVersion == AR_SREV_VERSION_5416_PCI ||
-                    ((AR_SREV_9160(ah) || AR_SREV_9280(ah) || AR_SREV_9287(ah)) &&
-                     !ah->is_pciexpress)) {
-                        ah->config.serialize_regmode =
-                                SER_REG_MODE_ON;
-                } else {
-                        ah->config.serialize_regmode =
-                                SER_REG_MODE_OFF;
-                }
-        }
-
-        ath_dbg(common, RESET, "serialize_regmode is %d\n",
-                ah->config.serialize_regmode);
-
-        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-                ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1;
-        else
-                ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;
-
-        switch (ah->hw_version.macVersion) {
-        case AR_SREV_VERSION_5416_PCI:
-        case AR_SREV_VERSION_5416_PCIE:
-        case AR_SREV_VERSION_9160:
-        case AR_SREV_VERSION_9100:
-        case AR_SREV_VERSION_9280:
-        case AR_SREV_VERSION_9285:
-        case AR_SREV_VERSION_9287:
-        case AR_SREV_VERSION_9271:
-        case AR_SREV_VERSION_9300:
-        case AR_SREV_VERSION_9330:
-        case AR_SREV_VERSION_9485:
-        case AR_SREV_VERSION_9340:
-        case AR_SREV_VERSION_9462:
-        case AR_SREV_VERSION_9550:
-        case AR_SREV_VERSION_9565:
-                break;
-        default:
-                ath_err(common,
-                        "Mac Chip Rev 0x%02x.%x is not supported by this driver\n",
-                        ah->hw_version.macVersion, ah->hw_version.macRev);
-                return -EOPNOTSUPP;
-        }
-
         if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah) ||
             AR_SREV_9330(ah) || AR_SREV_9550(ah))
                 ah->is_pciexpress = false;
@@ -609,10 +570,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         ah->hw_version.phyRev = REG_READ(ah, AR_PHY_CHIP_ID);
         ath9k_hw_init_cal_settings(ah);
 
-        ah->ani_function = ATH9K_ANI_ALL;
-        if (!AR_SREV_9300_20_OR_LATER(ah))
-                ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
-
         if (!ah->is_pciexpress)
                 ath9k_hw_disablepcie(ah);
 
@@ -631,15 +588,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
                 return r;
         }
 
-        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-                ah->tx_trig_level = (AR_FTRIG_256B >> AR_FTRIG_S);
-        else
-                ah->tx_trig_level = (AR_FTRIG_512B >> AR_FTRIG_S);
-
-        if (AR_SREV_9330(ah))
-                ah->bb_watchdog_timeout_ms = 85;
-        else
-                ah->bb_watchdog_timeout_ms = 25;
+        ath9k_hw_init_hang_checks(ah);
 
         common->state = ATH_HW_INITIALIZED;
 
@@ -672,6 +621,7 @@ int ath9k_hw_init(struct ath_hw *ah)
         case AR9300_DEVID_AR9462:
         case AR9485_DEVID_AR1111:
         case AR9300_DEVID_AR9565:
+        case AR9300_DEVID_AR953X:
                 break;
         default:
                 if (common->bus_ops->ath_bus_type == ATH_USB)
@@ -807,7 +757,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 /* program BB PLL phase_shift */
                 REG_RMW_FIELD(ah, AR_CH0_BB_DPLL3,
                               AR_CH0_BB_DPLL3_PHASE_SHIFT, 0x1);
-        } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
+        } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah)) {
                 u32 regval, pll2_divint, pll2_divfrac, refdiv;
 
                 REG_WRITE(ah, AR_RTC_PLL_CONTROL, 0x1142c);
@@ -817,9 +767,15 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 udelay(100);
 
                 if (ah->is_clk_25mhz) {
-                        pll2_divint = 0x54;
-                        pll2_divfrac = 0x1eb85;
-                        refdiv = 3;
+                        if (AR_SREV_9531(ah)) {
+                                pll2_divint = 0x1c;
+                                pll2_divfrac = 0xa3d2;
+                                refdiv = 1;
+                        } else {
+                                pll2_divint = 0x54;
+                                pll2_divfrac = 0x1eb85;
+                                refdiv = 3;
+                        }
                 } else {
                         if (AR_SREV_9340(ah)) {
                                 pll2_divint = 88;
@@ -833,7 +789,10 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
                 }
 
                 regval = REG_READ(ah, AR_PHY_PLL_MODE);
-                regval |= (0x1 << 16);
+                if (AR_SREV_9531(ah))
+                        regval |= (0x1 << 22);
+                else
+                        regval |= (0x1 << 16);
                 REG_WRITE(ah, AR_PHY_PLL_MODE, regval);
                 udelay(100);
 
@@ -843,14 +802,33 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 
                 regval = REG_READ(ah, AR_PHY_PLL_MODE);
                 if (AR_SREV_9340(ah))
-                        regval = (regval & 0x80071fff) | (0x1 << 30) |
-                                 (0x1 << 13) | (0x4 << 26) | (0x18 << 19);
+                        regval = (regval & 0x80071fff) |
+                                (0x1 << 30) |
+                                (0x1 << 13) |
+                                (0x4 << 26) |
+                                (0x18 << 19);
+                else if (AR_SREV_9531(ah))
+                        regval = (regval & 0x01c00fff) |
+                                (0x1 << 31) |
+                                (0x2 << 29) |
+                                (0xa << 25) |
+                                (0x1 << 19) |
+                                (0x6 << 12);
                 else
-                        regval = (regval & 0x80071fff) | (0x3 << 30) |
-                                 (0x1 << 13) | (0x4 << 26) | (0x60 << 19);
+                        regval = (regval & 0x80071fff) |
+                                (0x3 << 30) |
+                                (0x1 << 13) |
+                                (0x4 << 26) |
+                                (0x60 << 19);
                 REG_WRITE(ah, AR_PHY_PLL_MODE, regval);
-                REG_WRITE(ah, AR_PHY_PLL_MODE,
-                          REG_READ(ah, AR_PHY_PLL_MODE) & 0xfffeffff);
+
+                if (AR_SREV_9531(ah))
+                        REG_WRITE(ah, AR_PHY_PLL_MODE,
+                                  REG_READ(ah, AR_PHY_PLL_MODE) & 0xffbfffff);
+                else
+                        REG_WRITE(ah, AR_PHY_PLL_MODE,
+                                  REG_READ(ah, AR_PHY_PLL_MODE) & 0xfffeffff);
+
                 udelay(1000);
         }
 
@@ -1532,76 +1510,6 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah)
         }
 }
 
-static bool ath9k_hw_check_dcs(u32 dma_dbg, u32 num_dcu_states,
-                               int *hang_state, int *hang_pos)
-{
-        static u32 dcu_chain_state[] = {5, 6, 9}; /* DCU chain stuck states */
-        u32 chain_state, dcs_pos, i;
-
-        for (dcs_pos = 0; dcs_pos < num_dcu_states; dcs_pos++) {
-                chain_state = (dma_dbg >> (5 * dcs_pos)) & 0x1f;
-                for (i = 0; i < 3; i++) {
-                        if (chain_state == dcu_chain_state[i]) {
-                                *hang_state = chain_state;
-                                *hang_pos = dcs_pos;
-                                return true;
-                        }
-                }
-        }
-        return false;
-}
-
-#define DCU_COMPLETE_STATE        1
-#define DCU_COMPLETE_STATE_MASK 0x3
-#define NUM_STATUS_READS         50
-static bool ath9k_hw_detect_mac_hang(struct ath_hw *ah)
-{
-        u32 chain_state, comp_state, dcs_reg = AR_DMADBG_4;
-        u32 i, hang_pos, hang_state, num_state = 6;
-
-        comp_state = REG_READ(ah, AR_DMADBG_6);
-
-        if ((comp_state & DCU_COMPLETE_STATE_MASK) != DCU_COMPLETE_STATE) {
-                ath_dbg(ath9k_hw_common(ah), RESET,
-                        "MAC Hang signature not found at DCU complete\n");
-                return false;
-        }
-
-        chain_state = REG_READ(ah, dcs_reg);
-        if (ath9k_hw_check_dcs(chain_state, num_state, &hang_state, &hang_pos))
-                goto hang_check_iter;
-
-        dcs_reg = AR_DMADBG_5;
-        num_state = 4;
-        chain_state = REG_READ(ah, dcs_reg);
-        if (ath9k_hw_check_dcs(chain_state, num_state, &hang_state, &hang_pos))
-                goto hang_check_iter;
-
-        ath_dbg(ath9k_hw_common(ah), RESET,
-                "MAC Hang signature 1 not found\n");
-        return false;
-
-hang_check_iter:
-        ath_dbg(ath9k_hw_common(ah), RESET,
-                "DCU registers: chain %08x complete %08x Hang: state %d pos %d\n",
-                chain_state, comp_state, hang_state, hang_pos);
-
-        for (i = 0; i < NUM_STATUS_READS; i++) {
-                chain_state = REG_READ(ah, dcs_reg);
-                chain_state = (chain_state >> (5 * hang_pos)) & 0x1f;
-                comp_state = REG_READ(ah, AR_DMADBG_6);
-
-                if (((comp_state & DCU_COMPLETE_STATE_MASK) !=
-                                        DCU_COMPLETE_STATE) ||
-                    (chain_state != hang_state))
-                        return false;
-        }
-
-        ath_dbg(ath9k_hw_common(ah), RESET, "MAC Hang signature 1 found\n");
-
-        return true;
-}
-
 void ath9k_hw_check_nav(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
@@ -1676,7 +1584,6 @@ static void ath9k_hw_reset_opmode(struct ath_hw *ah,
 
         REG_RMW(ah, AR_STA_ID1, macStaId1
                   | AR_STA_ID1_RTS_USE_DEF
-                  | (ah->config.ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)
                   | ah->sta_id1_defaults,
                   ~AR_STA_ID1_SADH_MASK);
         ath_hw_setbssidmask(common);
@@ -1735,7 +1642,7 @@ static void ath9k_hw_init_desc(struct ath_hw *ah)
                 }
 #ifdef __BIG_ENDIAN
                 else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
-                         AR_SREV_9550(ah))
+                         AR_SREV_9550(ah) || AR_SREV_9531(ah))
                         REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0);
                 else
                         REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
@@ -1865,7 +1772,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         /* Save TSF before chip reset, a cold reset clears it */
         tsf = ath9k_hw_gettsf64(ah);
         getrawmonotonic(&ts);
-        usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000;
+        usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000;
 
         saveLedState = REG_READ(ah, AR_CFG_LED) &
                 (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
@@ -1899,7 +1806,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         /* Restore TSF */
         getrawmonotonic(&ts);
-        usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec;
+        usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000 - usec;
         ath9k_hw_settsf64(ah, tsf + usec);
 
         if (AR_SREV_9280_20_OR_LATER(ah))
@@ -2008,10 +1915,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_loadnf(ah, chan);
         ath9k_hw_start_nfcal(ah, true);
 
-        if (AR_SREV_9300_20_OR_LATER(ah)) {
+        if (AR_SREV_9300_20_OR_LATER(ah))
                 ar9003_hw_bb_watchdog_config(ah);
+
+        if (ah->config.hw_hang_checks & HW_PHYRESTART_CLC_WAR)
                 ar9003_hw_disable_phy_restart(ah);
-        }
 
         ath9k_hw_apply_gpio_override(ah);
 
@@ -2135,7 +2043,11 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)
 
         REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
                     AR_RTC_FORCE_WAKE_EN);
-        udelay(50);
+
+        if (AR_SREV_9100(ah))
+                udelay(10000);
+        else
+                udelay(50);
 
         for (i = POWER_UP_TIME / 50; i > 0; i--) {
                 val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M;
@@ -2564,13 +2476,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
             ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
                         pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
 
-        /*
-         * Fast channel change across bands is available
-         * only for AR9462 and AR9565.
-         */
-        if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
-                pCap->hw_caps |= ATH9K_HW_CAP_FCC_BAND_SWITCH;
-
         return 0;
 }
 
@@ -3084,14 +2989,14 @@ void ath_gen_timer_isr(struct ath_hw *ah)
         trigger_mask &= timer_table->timer_mask;
         thresh_mask &= timer_table->timer_mask;
 
-        trigger_mask &= ~thresh_mask;
-
         for_each_set_bit(index, &thresh_mask, ARRAY_SIZE(timer_table->timers)) {
                 timer = timer_table->timers[index];
                 if (!timer)
                     continue;
                 if (!timer->overflow)
                     continue;
+
+                trigger_mask &= ~BIT(index);
                 timer->overflow(timer->arg);
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 6132ffeb3048..e766399bdcda 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -52,6 +52,7 @@
 #define AR9300_DEVID_QCA955X    0x0038
 #define AR9485_DEVID_AR1111     0x0037
 #define AR9300_DEVID_AR9565     0x0036
+#define AR9300_DEVID_AR953X     0x003d
 
 #define AR5416_AR9100_DEVID     0x000b
 
@@ -277,10 +278,24 @@ struct ath9k_hw_capabilities {
         u8 txs_len;
 };
 
+#define AR_NO_SPUR              0x8000
+#define AR_BASE_FREQ_2GHZ       2300
+#define AR_BASE_FREQ_5GHZ       4900
+#define AR_SPUR_FEEQ_BOUND_HT40 19
+#define AR_SPUR_FEEQ_BOUND_HT20 10
+
+enum ath9k_hw_hang_checks {
+        HW_BB_WATCHDOG            = BIT(0),
+        HW_PHYRESTART_CLC_WAR     = BIT(1),
+        HW_BB_RIFS_HANG           = BIT(2),
+        HW_BB_DFS_HANG            = BIT(3),
+        HW_BB_RX_CLEAR_STUCK_HANG = BIT(4),
+        HW_MAC_HANG               = BIT(5),
+};
+
 struct ath9k_ops_config {
         int dma_beacon_response_time;
         int sw_beacon_response_time;
-        int ack_6mb;
         u32 cwm_ignore_extcca;
         u32 pcie_waen;
         u8 analog_shiftreg;
@@ -292,13 +307,9 @@ struct ath9k_ops_config {
         int serialize_regmode;
         bool rx_intr_mitigation;
         bool tx_intr_mitigation;
-#define AR_NO_SPUR              0x8000
-#define AR_BASE_FREQ_2GHZ       2300
-#define AR_BASE_FREQ_5GHZ       4900
-#define AR_SPUR_FEEQ_BOUND_HT40 19
-#define AR_SPUR_FEEQ_BOUND_HT20 10
         u8 max_txtrig_level;
         u16 ani_poll_interval; /* ANI poll interval in ms */
+        u16 hw_hang_checks;
 
         /* Platform specific config */
         u32 aspm_l1_fix;
@@ -573,6 +584,10 @@ struct ath_hw_radar_conf {
  *      register settings through the register initialization.
  */
 struct ath_hw_private_ops {
+        void (*init_hang_checks)(struct ath_hw *ah);
+        bool (*detect_mac_hang)(struct ath_hw *ah);
+        bool (*detect_bb_hang)(struct ath_hw *ah);
+
         /* Calibration ops */
         void (*init_cal_settings)(struct ath_hw *ah);
         bool (*init_cal)(struct ath_hw *ah, struct ath9k_channel *chan);
@@ -1029,6 +1044,7 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah);
  * Code specific to AR9003, we stuff these here to avoid callbacks
  * for older families
  */
+bool ar9003_hw_bb_watchdog_check(struct ath_hw *ah);
 void ar9003_hw_bb_watchdog_config(struct ath_hw *ah);
 void ar9003_hw_bb_watchdog_read(struct ath_hw *ah);
 void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index e63465b7eab9..f2a17fcf1ae4 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -763,10 +763,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 
         setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
         INIT_WORK(&sc->hw_reset_work, ath_reset_work);
-        INIT_WORK(&sc->hw_check_work, ath_hw_check);
         INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
         INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
-        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
 
         /*
          * Cache line size is used to size and align various
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index aed7e29dc50f..30dcef5aba10 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -65,50 +65,26 @@ void ath_tx_complete_poll_work(struct work_struct *work)
 /*
  * Checks if the BB/MAC is hung.
  */
-void ath_hw_check(struct work_struct *work)
+bool ath_hw_check(struct ath_softc *sc)
 {
-        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        unsigned long flags;
-        int busy;
-        u8 is_alive, nbeacon = 1;
         enum ath_reset_type type;
+        bool is_alive;
 
         ath9k_ps_wakeup(sc);
+
         is_alive = ath9k_hw_check_alive(sc->sc_ah);
 
-        if ((is_alive && !AR_SREV_9300(sc->sc_ah)) || sc->tx99_state)
-                goto out;
-        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
+        if (!is_alive) {
                 ath_dbg(common, RESET,
-                        "DCU stuck is detected. Schedule chip reset\n");
+                        "HW hang detected, schedule chip reset\n");
                 type = RESET_TYPE_MAC_HANG;
-                goto sched_reset;
-        }
-
-        spin_lock_irqsave(&common->cc_lock, flags);
-        busy = ath_update_survey_stats(sc);
-        spin_unlock_irqrestore(&common->cc_lock, flags);
-
-        ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",
-                busy, sc->hw_busy_count + 1);
-        if (busy >= 99) {
-                if (++sc->hw_busy_count >= 3) {
-                        type = RESET_TYPE_BB_HANG;
-                        goto sched_reset;
-                }
-        } else if (busy >= 0) {
-                sc->hw_busy_count = 0;
-                nbeacon = 3;
+                ath9k_queue_reset(sc, type);
         }
 
-        ath_start_rx_poll(sc, nbeacon);
-        goto out;
-
-sched_reset:
-        ath9k_queue_reset(sc, type);
-out:
         ath9k_ps_restore(sc);
+
+        return is_alive;
 }
 
 /*
@@ -162,29 +138,6 @@ void ath_hw_pll_work(struct work_struct *work)
 }
 
 /*
- * RX Polling - monitors baseband hangs.
- */
-void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
-{
-        if (!AR_SREV_9300(sc->sc_ah))
-                return;
-
-        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-                return;
-
-        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
-                  (nbeacon * sc->cur_beacon_conf.beacon_interval));
-}
-
-void ath_rx_poll(unsigned long data)
-{
-        struct ath_softc *sc = (struct ath_softc *)data;
-
-        if (!test_bit(SC_OP_INVALID, &sc->sc_flags))
-                ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-}
-
-/*
  * PA Pre-distortion.
  */
 static void ath_paprd_activate(struct ath_softc *sc)
@@ -409,10 +362,10 @@ void ath_ani_calibrate(unsigned long data)
 
         /* Call ANI routine if necessary */
         if (aniflag) {
-                spin_lock_irqsave(&common->cc_lock, flags);
+                spin_lock(&common->cc_lock);
                 ath9k_hw_ani_monitor(ah, ah->curchan);
                 ath_update_survey_stats(sc);
-                spin_unlock_irqrestore(&common->cc_lock, flags);
+                spin_unlock(&common->cc_lock);
         }
 
         /* Perform calibration if necessary */
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 89d7e206992b..5f727588ca27 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -922,11 +922,29 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah)
                         mask2 |= AR_IMR_S2_CST;
         }
 
+        if (ah->config.hw_hang_checks & HW_BB_WATCHDOG) {
+                if (ints & ATH9K_INT_BB_WATCHDOG) {
+                        mask |= AR_IMR_BCNMISC;
+                        mask2 |= AR_IMR_S2_BB_WATCHDOG;
+                }
+        }
+
         ath_dbg(common, INTERRUPT, "new IMR 0x%x\n", mask);
         REG_WRITE(ah, AR_IMR, mask);
-        ah->imrs2_reg &= ~(AR_IMR_S2_TIM | AR_IMR_S2_DTIM | AR_IMR_S2_DTIMSYNC |
-                           AR_IMR_S2_CABEND | AR_IMR_S2_CABTO |
-                           AR_IMR_S2_TSFOOR | AR_IMR_S2_GTT | AR_IMR_S2_CST);
+        ah->imrs2_reg &= ~(AR_IMR_S2_TIM |
+                           AR_IMR_S2_DTIM |
+                           AR_IMR_S2_DTIMSYNC |
+                           AR_IMR_S2_CABEND |
+                           AR_IMR_S2_CABTO |
+                           AR_IMR_S2_TSFOOR |
+                           AR_IMR_S2_GTT |
+                           AR_IMR_S2_CST);
+
+        if (ah->config.hw_hang_checks & HW_BB_WATCHDOG) {
+                if (ints & ATH9K_INT_BB_WATCHDOG)
+                        ah->imrs2_reg &= ~AR_IMR_S2_BB_WATCHDOG;
+        }
+
         ah->imrs2_reg |= mask2;
         REG_WRITE(ah, AR_IMR_S2, ah->imrs2_reg);
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 21b764ba6400..d0c3aec7c74e 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -170,7 +170,6 @@ void ath9k_ps_restore(struct ath_softc *sc)
 static void __ath_cancel_work(struct ath_softc *sc)
 {
         cancel_work_sync(&sc->paprd_work);
-        cancel_work_sync(&sc->hw_check_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
         cancel_delayed_work_sync(&sc->hw_pll_work);
 
@@ -194,7 +193,6 @@ void ath_restart_work(struct ath_softc *sc)
                 ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
                                      msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
 
-        ath_start_rx_poll(sc, 3);
         ath_start_ani(sc);
 }
 
@@ -204,11 +202,7 @@ static bool ath_prepare_reset(struct ath_softc *sc)
         bool ret = true;
 
         ieee80211_stop_queues(sc->hw);
-
-        sc->hw_busy_count = 0;
         ath_stop_ani(sc);
-        del_timer_sync(&sc->rx_poll_timer);
-
         ath9k_hw_disable_interrupts(ah);
 
         if (!ath_drain_all_txq(sc))
@@ -336,7 +330,6 @@ static int ath_set_channel(struct ath_softc *sc, struct cfg80211_chan_def *chand
         struct ieee80211_hw *hw = sc->hw;
         struct ath9k_channel *hchan;
         struct ieee80211_channel *chan = chandef->chan;
-        unsigned long flags;
         bool offchannel;
         int pos = chan->hw_value;
         int old_pos = -1;
@@ -354,9 +347,9 @@ static int ath_set_channel(struct ath_softc *sc, struct cfg80211_chan_def *chand
                 chan->center_freq, chandef->width);
 
         /* update survey stats for the old channel before switching */
-        spin_lock_irqsave(&common->cc_lock, flags);
+        spin_lock_bh(&common->cc_lock);
         ath_update_survey_stats(sc);
-        spin_unlock_irqrestore(&common->cc_lock, flags);
+        spin_unlock_bh(&common->cc_lock);
 
         ath9k_cmn_get_channel(hw, ah, chandef);
 
@@ -427,12 +420,6 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
         an->vif = vif;
 
         ath_tx_node_init(sc, an);
-
-        if (sta->ht_cap.ht_supported) {
-                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
-                                     sta->ht_cap.ampdu_factor);
-                an->mpdudensity = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
-        }
 }
 
 static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
@@ -454,14 +441,8 @@ void ath9k_tasklet(unsigned long data)
         ath9k_ps_wakeup(sc);
         spin_lock(&sc->sc_pcu_lock);
 
-        if ((status & ATH9K_INT_FATAL) ||
-            (status & ATH9K_INT_BB_WATCHDOG)) {
-
-                if (status & ATH9K_INT_FATAL)
-                        type = RESET_TYPE_FATAL_INT;
-                else
-                        type = RESET_TYPE_BB_WATCHDOG;
-
+        if (status & ATH9K_INT_FATAL) {
+                type = RESET_TYPE_FATAL_INT;
                 ath9k_queue_reset(sc, type);
 
                 /*
@@ -473,6 +454,28 @@ void ath9k_tasklet(unsigned long data)
                 goto out;
         }
 
+        if ((ah->config.hw_hang_checks & HW_BB_WATCHDOG) &&
+            (status & ATH9K_INT_BB_WATCHDOG)) {
+                spin_lock(&common->cc_lock);
+                ath_hw_cycle_counters_update(common);
+                ar9003_hw_bb_watchdog_dbg_info(ah);
+                spin_unlock(&common->cc_lock);
+
+                if (ar9003_hw_bb_watchdog_check(ah)) {
+                        type = RESET_TYPE_BB_WATCHDOG;
+                        ath9k_queue_reset(sc, type);
+
+                        /*
+                         * Increment the ref. counter here so that
+                         * interrupts are enabled in the reset routine.
+                         */
+                        atomic_inc(&ah->intr_ref_cnt);
+                        ath_dbg(common, ANY,
+                                "BB_WATCHDOG: Skipping interrupts\n");
+                        goto out;
+                }
+        }
+
         spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
                 /*
@@ -541,7 +544,7 @@ irqreturn_t ath_isr(int irq, void *dev)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
         enum ath9k_int status;
-        u32 sync_cause;
+        u32 sync_cause = 0;
         bool sched = false;
 
         /*
@@ -593,16 +596,9 @@ irqreturn_t ath_isr(int irq, void *dev)
             !(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)))
                 goto chip_reset;
 
-        if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
-            (status & ATH9K_INT_BB_WATCHDOG)) {
-
-                spin_lock(&common->cc_lock);
-                ath_hw_cycle_counters_update(common);
-                ar9003_hw_bb_watchdog_dbg_info(ah);
-                spin_unlock(&common->cc_lock);
-
+        if ((ah->config.hw_hang_checks & HW_BB_WATCHDOG) &&
+            (status & ATH9K_INT_BB_WATCHDOG))
                 goto chip_reset;
-        }
 
 #ifdef CONFIG_ATH9K_WOW
         if (status & ATH9K_INT_BMISS) {
@@ -732,11 +728,13 @@ static int ath9k_start(struct ieee80211_hw *hw)
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 ah->imask |= ATH9K_INT_RXHP |
-                             ATH9K_INT_RXLP |
-                             ATH9K_INT_BB_WATCHDOG;
+                             ATH9K_INT_RXLP;
         else
                 ah->imask |= ATH9K_INT_RX;
 
+        if (ah->config.hw_hang_checks & HW_BB_WATCHDOG)
+                ah->imask |= ATH9K_INT_BB_WATCHDOG;
+
         ah->imask |= ATH9K_INT_GTT;
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_HT)
@@ -860,7 +858,6 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         mutex_lock(&sc->mutex);
 
         ath_cancel_work(sc);
-        del_timer_sync(&sc->rx_poll_timer);
 
         if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
@@ -1791,13 +1788,12 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_supported_band *sband;
         struct ieee80211_channel *chan;
-        unsigned long flags;
         int pos;
 
         if (config_enabled(CONFIG_ATH9K_TX99))
                 return -EOPNOTSUPP;
 
-        spin_lock_irqsave(&common->cc_lock, flags);
+        spin_lock_bh(&common->cc_lock);
         if (idx == 0)
                 ath_update_survey_stats(sc);
 
@@ -1811,7 +1807,7 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,
                 sband = hw->wiphy->bands[IEEE80211_BAND_5GHZ];
 
         if (!sband || idx >= sband->n_channels) {
-                spin_unlock_irqrestore(&common->cc_lock, flags);
+                spin_unlock_bh(&common->cc_lock);
                 return -ENOENT;
         }
 
@@ -1819,7 +1815,7 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,
         pos = chan->hw_value;
         memcpy(survey, &sc->survey[pos], sizeof(*survey));
         survey->channel = chan;
-        spin_unlock_irqrestore(&common->cc_lock, flags);
+        spin_unlock_bh(&common->cc_lock);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index e9a585758941..55724b02316b 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -412,6 +412,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          0x11AD, /* LITEON */
+                         0x06B2),
+          .driver_data = ATH9K_PCI_AR9565_1ANT },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         0x11AD, /* LITEON */
+                         0x0842),
+          .driver_data = ATH9K_PCI_AR9565_1ANT },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         0x11AD, /* LITEON */
                          0x6671),
           .driver_data = ATH9K_PCI_AR9565_1ANT },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -424,6 +434,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
                          0x1B9A, /* XAVI */
                          0x2812),
           .driver_data = ATH9K_PCI_AR9565_1ANT },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         0x1B9A, /* XAVI */
+                         0x28A1),
+          .driver_data = ATH9K_PCI_AR9565_1ANT },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x218A),
+          .driver_data = ATH9K_PCI_AR9565_1ANT },
 
         /* WB335 1-ANT / Antenna Diversity */
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -469,22 +489,17 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          0x11AD, /* LITEON */
-                         0x0682),
+                         0x06A2),
           .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
-                         PCI_VENDOR_ID_AZWAVE,
-                         0x213A),
-          .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
-        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-                         0x0036,
-                         PCI_VENDOR_ID_LENOVO,
-                         0x3026),
+                         0x11AD, /* LITEON */
+                         0x0682),
           .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
-                         PCI_VENDOR_ID_LENOVO,
-                         0x4026),
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x213A),
           .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
@@ -504,37 +519,35 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_DELL,
-                         0x020E),
+                         0x020C),
           .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
 
-        /* WB335 2-ANT */
+        /* WB335 2-ANT / Antenna-Diversity */
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_SAMSUNG,
                          0x411A),
-          .driver_data = ATH9K_PCI_AR9565_2ANT },
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_SAMSUNG,
                          0x411B),
-          .driver_data = ATH9K_PCI_AR9565_2ANT },
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_SAMSUNG,
                          0x411C),
-          .driver_data = ATH9K_PCI_AR9565_2ANT },
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_SAMSUNG,
                          0x411D),
-          .driver_data = ATH9K_PCI_AR9565_2ANT },
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_SAMSUNG,
                          0x411E),
-          .driver_data = ATH9K_PCI_AR9565_2ANT },
-
-        /* WB335 2-ANT / Antenna-Diversity */
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
                          PCI_VENDOR_ID_ATHEROS,
@@ -562,11 +575,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
+                         0x11AD, /* LITEON */
+                         0x0832),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         0x11AD, /* LITEON */
+                         0x0692),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
                          PCI_VENDOR_ID_AZWAVE,
                          0x2130),
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x213B),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x2182),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
                          0x144F, /* ASKEY */
                          0x7202),
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
@@ -577,6 +610,11 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                          0x0036,
+                         0x1B9A, /* XAVI */
+                         0x28A2),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
                          0x185F, /* WNC */
                          0x3027),
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
@@ -590,6 +628,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
                          PCI_VENDOR_ID_FOXCONN,
                          0xE07F),
           .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_FOXCONN,
+                         0xE081),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_LENOVO,
+                         0x3026),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_LENOVO,
+                         0x4026),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_ASUSTEK,
+                         0x85F2),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0036,
+                         PCI_VENDOR_ID_DELL,
+                         0x020E),
+          .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
 
         /* PCI-E AR9565 (WB335) */
         { PCI_VDEVICE(ATHEROS, 0x0036),
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 3692b2a501a2..f7cc5b37a18f 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -419,7 +419,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
                 rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;
         }
 
-        if (AR_SREV_9550(sc->sc_ah))
+        if (AR_SREV_9550(sc->sc_ah) || AR_SREV_9531(sc->sc_ah))
                 rfilt |= ATH9K_RX_FILTER_4ADDRESS;
 
         return rfilt;
@@ -850,20 +850,15 @@ static int ath9k_process_rate(struct ath_common *common,
         enum ieee80211_band band;
         unsigned int i = 0;
         struct ath_softc __maybe_unused *sc = common->priv;
+        struct ath_hw *ah = sc->sc_ah;
 
-        band = hw->conf.chandef.chan->band;
+        band = ah->curchan->chan->band;
         sband = hw->wiphy->bands[band];
 
-        switch (hw->conf.chandef.width) {
-        case NL80211_CHAN_WIDTH_5:
+        if (IS_CHAN_QUARTER_RATE(ah->curchan))
                 rxs->flag |= RX_FLAG_5MHZ;
-                break;
-        case NL80211_CHAN_WIDTH_10:
+        else if (IS_CHAN_HALF_RATE(ah->curchan))
                 rxs->flag |= RX_FLAG_10MHZ;
-                break;
-        default:
-                break;
-        }
 
         if (rx_stats->rs_rate & 0x80) {
                 /* HT rate */
@@ -982,7 +977,7 @@ static bool ath9k_is_mybeacon(struct ath_softc *sc, struct ieee80211_hdr *hdr)
         if (ieee80211_is_beacon(hdr->frame_control)) {
                 RX_STAT_INC(rx_beacons);
                 if (!is_zero_ether_addr(common->curbssid) &&
-                    ether_addr_equal(hdr->addr3, common->curbssid))
+                    ether_addr_equal_64bits(hdr->addr3, common->curbssid))
                         return true;
         }
 
@@ -1077,9 +1072,13 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc,
         }
 
         rx_stats->is_mybeacon = ath9k_is_mybeacon(sc, hdr);
-        if (rx_stats->is_mybeacon) {
-                sc->hw_busy_count = 0;
-                ath_start_rx_poll(sc, 3);
+
+        /*
+         * This shouldn't happen, but have a safety check anyway.
+         */
+        if (WARN_ON(!ah->curchan)) {
+                ret = -EINVAL;
+                goto exit;
         }
 
         if (ath9k_process_rate(common, hw, rx_stats, rx_status)) {
@@ -1089,8 +1088,8 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc,
 
         ath9k_process_rssi(common, hw, rx_stats, rx_status);
 
-        rx_status->band = hw->conf.chandef.chan->band;
-        rx_status->freq = hw->conf.chandef.chan->center_freq;
+        rx_status->band = ah->curchan->chan->band;
+        rx_status->freq = ah->curchan->chan->center_freq;
         rx_status->antenna = rx_stats->rs_antenna;
         rx_status->flag |= RX_FLAG_MACTIME_END;
 
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 9ad007312c9d..b1fd3fa84983 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -304,6 +304,7 @@
 #define AR_IMR_S2              0x00ac
 #define AR_IMR_S2_QCU_TXURN    0x000003FF
 #define AR_IMR_S2_QCU_TXURN_S  0
+#define AR_IMR_S2_BB_WATCHDOG  0x00010000
 #define AR_IMR_S2_CST          0x00400000
 #define AR_IMR_S2_GTT          0x00800000
 #define AR_IMR_S2_TIM          0x01000000
@@ -812,6 +813,9 @@
 #define AR_SREV_REVISION_9565_101       1
 #define AR_SREV_REVISION_9565_11        2
 #define AR_SREV_VERSION_9550            0x400
+#define AR_SREV_VERSION_9531            0x500
+#define AR_SREV_REVISION_9531_10        0
+#define AR_SREV_REVISION_9531_11        1
 
 #define AR_SREV_5416(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -945,11 +949,19 @@
 #define AR_SREV_9580(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \
         ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9580_10))
-
 #define AR_SREV_9580_10(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \
         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9580_10))
 
+#define AR_SREV_9531(_ah) \
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531))
+#define AR_SREV_9531_10(_ah) \
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_10))
+#define AR_SREV_9531_11(_ah) \
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_11))
+
 /* NOTE: When adding chips newer than Peacock, add chip check here */
 #define AR_SREV_9580_10_OR_LATER(_ah) \
         (AR_SREV_9580(_ah))
diff --git a/drivers/net/wireless/ath/ath9k/spectral.c b/drivers/net/wireless/ath/ath9k/spectral.c
index 11adb5eb51cc..99f4de95c264 100644
--- a/drivers/net/wireless/ath/ath9k/spectral.c
+++ b/drivers/net/wireless/ath/ath9k/spectral.c
@@ -497,7 +497,7 @@ static int remove_buf_file_handler(struct dentry *dentry)
         return 0;
 }
 
-struct rchan_callbacks rfs_spec_scan_cb = {
+static struct rchan_callbacks rfs_spec_scan_cb = {
         .create_buf_file = create_buf_file_handler,
         .remove_buf_file = remove_buf_file_handler,
 };
diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c
index f1cde81bb7a2..1b3230fa3651 100644
--- a/drivers/net/wireless/ath/ath9k/wow.c
+++ b/drivers/net/wireless/ath/ath9k/wow.c
@@ -197,7 +197,6 @@ int ath9k_suspend(struct ieee80211_hw *hw,
 
         ath_cancel_work(sc);
         ath_stop_ani(sc);
-        del_timer_sync(&sc->rx_poll_timer);
 
         if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 9d735c55a0f3..e8d0e7fc77da 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -774,11 +774,6 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
         if (bt_aggr_limit)
                 aggr_limit = bt_aggr_limit;
 
-        /*
-         * h/w can accept aggregates up to 16 bit lengths (65535).
-         * The IE, however can hold up to 65536, which shows up here
-         * as zero. Ignore 65536 since we  are constrained by hw.
-         */
         if (tid->an->maxampdu)
                 aggr_limit = min(aggr_limit, tid->an->maxampdu);
 
@@ -1403,8 +1398,8 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
          * has already been added.
          */
         if (sta->ht_cap.ht_supported) {
-                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
-                                     sta->ht_cap.ampdu_factor);
+                an->maxampdu = (1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
+                                      sta->ht_cap.ampdu_factor)) - 1;
                 density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
                 an->mpdudensity = density;
         }
diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c
index 3d70cd277fd7..1c0af9cd9a85 100644
--- a/drivers/net/wireless/ath/carl9170/debug.c
+++ b/drivers/net/wireless/ath/carl9170/debug.c
@@ -37,7 +37,6 @@
  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 349fa22a921a..4c3f576c3144 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -37,7 +37,6 @@
  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index e935f61c7fad..1b1b20751ead 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -37,7 +37,6 @@
  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/etherdevice.h>
@@ -536,7 +535,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal(hdr->addr3, ar->common.curbssid) ||
+        if (!ether_addr_equal_64bits(hdr->addr3, ar->common.curbssid) ||
             !ar->common.curaid)
                 return;
 
@@ -602,8 +601,8 @@ static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len)
 
                 if (bar->start_seq_num == entry_bar->start_seq_num &&
                     TID_CHECK(bar->control, entry_bar->control) &&
-                    ether_addr_equal(bar->ra, entry_bar->ta) &&
-                    ether_addr_equal(bar->ta, entry_bar->ra)) {
+                    ether_addr_equal_64bits(bar->ra, entry_bar->ta) &&
+                    ether_addr_equal_64bits(bar->ta, entry_bar->ra)) {
                         struct ieee80211_tx_info *tx_info;
 
                         tx_info = IEEE80211_SKB_CB(entry_skb);
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index e3f696ee4d23..4cadfd48ffdf 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -37,7 +37,6 @@
  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index 8205d3e4ab66..10919f95a83c 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -156,6 +156,19 @@ void wil6210_enable_irq(struct wil6210_priv *wil)
         iowrite32(WIL_ICR_ICC_VALUE, wil->csr + HOSTADDR(RGF_DMA_EP_MISC_ICR) +
                   offsetof(struct RGF_ICR, ICC));
 
+        /* interrupt moderation parameters */
+        if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {
+                /* disable interrupt moderation for monitor
+                 * to get better timestamp precision
+                 */
+                iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+        } else {
+                iowrite32(WIL6210_ITR_TRSH,
+                          wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
+                iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
+                          wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+        }
+
         wil6210_unmask_irq_pseudo(wil);
         wil6210_unmask_irq_tx(wil);
         wil6210_unmask_irq_rx(wil);
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index d505b2676a73..9b88440ef05b 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -21,6 +21,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <net/ipv6.h>
+#include <asm/processor.h>
 
 #include "wil6210.h"
 #include "wmi.h"
@@ -377,6 +378,8 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
         }
         skb_trim(skb, dmalen);
 
+        prefetch(skb->data);
+
         wil_hex_dump_txrx("Rx ", DUMP_PREFIX_OFFSET, 16, 1,
                           skb->data, skb_headlen(skb), false);
 
@@ -673,9 +676,12 @@ static int wil_tx_desc_offload_cksum_set(struct wil6210_priv *wil,
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return 0;
 
+        d->dma.b11 = ETH_HLEN; /* MAC header length */
+
         switch (skb->protocol) {
         case cpu_to_be16(ETH_P_IP):
                 protocol = ip_hdr(skb)->protocol;
+                d->dma.b11 |= BIT(DMA_CFG_DESC_TX_OFFLOAD_CFG_L3T_IPV4_POS);
                 break;
         case cpu_to_be16(ETH_P_IPV6):
                 protocol = ipv6_hdr(skb)->nexthdr;
@@ -701,8 +707,6 @@ static int wil_tx_desc_offload_cksum_set(struct wil6210_priv *wil,
         }
 
         d->dma.ip_length = skb_network_header_len(skb);
-        d->dma.b11 = ETH_HLEN; /* MAC header length */
-        d->dma.b11 |= BIT(DMA_CFG_DESC_TX_OFFLOAD_CFG_L3T_IPV4_POS);
         /* Enable TCP/UDP checksum */
         d->dma.d0 |= BIT(DMA_CFG_DESC_TX_0_TCP_UDP_CHECKSUM_EN_POS);
         /* Calculate pseudo-header */
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index c4a51638736a..1f91eaf95bbe 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -39,6 +39,7 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)
 #define WIL6210_MAX_TX_RINGS    (24) /* HW limit */
 #define WIL6210_MAX_CID         (8) /* HW limit */
 #define WIL6210_NAPI_BUDGET     (16) /* arbitrary */
+#define WIL6210_ITR_TRSH        (10000) /* arbitrary - about 15 IRQs/msec */
 
 /* Hardware definitions begin */
 
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index b73b7e3e2196..bf93ea859f2d 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -39,7 +39,6 @@
 
 ******************************************************************************/
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 
 #include <linux/kernel.h>
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 5e2749dd1124..4cfb4d99ced0 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -32,7 +32,6 @@
 #ifdef __IN_PCMCIA_PACKAGE__
 #include <pcmcia/k_compat.h>
 #endif
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/ptrace.h>
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index 64d5973ec28b..5cd97e3cbee3 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -22,7 +22,6 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/netdevice.h>
 #include "atmel.h"
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
index 12c27d13df7f..c229210d50ba 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
@@ -41,9 +41,6 @@ struct brcmf_proto_bcdc_dcmd {
         __le32 status;  /* status code returned from the device */
 };
 
-/* Max valid buffer size that can be sent to the dongle */
-#define BCDC_MAX_MSG_SIZE       (ETH_FRAME_LEN+ETH_FCS_LEN)
-
 /* BCDC flag definitions */
 #define BCDC_DCMD_ERROR         0x01            /* 1=cmd failed */
 #define BCDC_DCMD_SET           0x02            /* 0=get, 1=set cmd */
@@ -133,9 +130,12 @@ brcmf_proto_bcdc_msg(struct brcmf_pub *drvr, int ifidx, uint cmd, void *buf,
         if (buf)
                 memcpy(bcdc->buf, buf, len);
 
+        len += sizeof(*msg);
+        if (len > BRCMF_TX_IOCTL_MAX_MSG_SIZE)
+                len = BRCMF_TX_IOCTL_MAX_MSG_SIZE;
+
         /* Send request */
-        return brcmf_bus_txctl(drvr->bus_if, (unsigned char *)&bcdc->msg,
-                               len + sizeof(struct brcmf_proto_bcdc_dcmd));
+        return brcmf_bus_txctl(drvr->bus_if, (unsigned char *)&bcdc->msg, len);
 }
 
 static int brcmf_proto_bcdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 2b5cde67e728..34c993dd0602 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -47,8 +47,6 @@
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT    2
 
-#define SDIO_VENDOR_ID_BROADCOM         0x02d0
-
 #define DMA_ALIGN_MASK  0x03
 
 #define SDIO_FUNC1_BLOCKSIZE            64
@@ -216,94 +214,104 @@ static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func,
         return err_ret;
 }
 
-static int brcmf_sdiod_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw,
-                                    uint func, uint regaddr, u8 *byte)
+static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn,
+                                    u32 addr, u8 regsz, void *data, bool write)
 {
-        int err_ret;
+        struct sdio_func *func;
+        int ret;
 
-        brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);
+        brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
+                  write, fn, addr, regsz);
 
-        brcmf_sdiod_pm_resume_wait(sdiodev, &sdiodev->request_byte_wait);
+        brcmf_sdiod_pm_resume_wait(sdiodev, &sdiodev->request_word_wait);
         if (brcmf_sdiod_pm_resume_error(sdiodev))
                 return -EIO;
 
-        if (rw && func == 0) {
-                /* handle F0 separately */
-                err_ret = brcmf_sdiod_f0_writeb(sdiodev->func[func],
-                                                regaddr, *byte);
-        } else {
-                if (rw) /* CMD52 Write */
-                        sdio_writeb(sdiodev->func[func], *byte, regaddr,
-                                    &err_ret);
-                else if (func == 0) {
-                        *byte = sdio_f0_readb(sdiodev->func[func], regaddr,
-                                              &err_ret);
+        /* only allow byte access on F0 */
+        if (WARN_ON(regsz > 1 && !fn))
+                return -EINVAL;
+        func = sdiodev->func[fn];
+
+        switch (regsz) {
+        case sizeof(u8):
+                if (write) {
+                        if (fn)
+                                sdio_writeb(func, *(u8 *)data, addr, &ret);
+                        else
+                                ret = brcmf_sdiod_f0_writeb(func, addr,
+                                                            *(u8 *)data);
                 } else {
-                        *byte = sdio_readb(sdiodev->func[func], regaddr,
-                                           &err_ret);
+                        if (fn)
+                                *(u8 *)data = sdio_readb(func, addr, &ret);
+                        else
+                                *(u8 *)data = sdio_f0_readb(func, addr, &ret);
                 }
+                break;
+        case sizeof(u16):
+                if (write)
+                        sdio_writew(func, *(u16 *)data, addr, &ret);
+                else
+                        *(u16 *)data = sdio_readw(func, addr, &ret);
+                break;
+        case sizeof(u32):
+                if (write)
+                        sdio_writel(func, *(u32 *)data, addr, &ret);
+                else
+                        *(u32 *)data = sdio_readl(func, addr, &ret);
+                break;
+        default:
+                brcmf_err("invalid size: %d\n", regsz);
+                break;
         }
 
-        if (err_ret) {
+        if (ret) {
                 /*
                  * SleepCSR register access can fail when
                  * waking up the device so reduce this noise
                  * in the logs.
                  */
-                if (regaddr != SBSDIO_FUNC1_SLEEPCSR)
-                        brcmf_err("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",
-                                  rw ? "write" : "read", func, regaddr, *byte,
-                                  err_ret);
+                if (addr != SBSDIO_FUNC1_SLEEPCSR)
+                        brcmf_err("failed to %s data F%d@0x%05x, err: %d\n",
+                                  write ? "write" : "read", fn, addr, ret);
                 else
-                        brcmf_dbg(SDIO, "Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",
-                                  rw ? "write" : "read", func, regaddr, *byte,
-                                  err_ret);
+                        brcmf_dbg(SDIO, "failed to %s data F%d@0x%05x, err: %d\n",
+                                  write ? "write" : "read", fn, addr, ret);
         }
-        return err_ret;
+        return ret;
 }
 
-static int brcmf_sdiod_request_word(struct brcmf_sdio_dev *sdiodev, uint rw,
-                                    uint func, uint addr, u32 *word,
-                                    uint nbytes)
+static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
+                                   u8 regsz, void *data, bool write)
 {
-        int err_ret = -EIO;
-
-        if (func == 0) {
-                brcmf_err("Only CMD52 allowed to F0\n");
-                return -EINVAL;
-        }
-
-        brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
-                  rw, func, addr, nbytes);
+        u8 func_num;
+        s32 retry = 0;
+        int ret;
 
-        brcmf_sdiod_pm_resume_wait(sdiodev, &sdiodev->request_word_wait);
-        if (brcmf_sdiod_pm_resume_error(sdiodev))
-                return -EIO;
+        /*
+         * figure out how to read the register based on address range
+         * 0x00 ~ 0x7FF: function 0 CCCR and FBR
+         * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
+         * The rest: function 1 silicon backplane core registers
+         */
+        if ((addr & ~REG_F0_REG_MASK) == 0)
+                func_num = SDIO_FUNC_0;
+        else
+                func_num = SDIO_FUNC_1;
 
-        if (rw) {               /* CMD52 Write */
-                if (nbytes == 4)
-                        sdio_writel(sdiodev->func[func], *word, addr,
-                                    &err_ret);
-                else if (nbytes == 2)
-                        sdio_writew(sdiodev->func[func], (*word & 0xFFFF),
-                                    addr, &err_ret);
-                else
-                        brcmf_err("Invalid nbytes: %d\n", nbytes);
-        } else {                /* CMD52 Read */
-                if (nbytes == 4)
-                        *word = sdio_readl(sdiodev->func[func], addr, &err_ret);
-                else if (nbytes == 2)
-                        *word = sdio_readw(sdiodev->func[func], addr,
-                                           &err_ret) & 0xFFFF;
-                else
-                        brcmf_err("Invalid nbytes: %d\n", nbytes);
-        }
+        do {
+                if (!write)
+                        memset(data, 0, regsz);
+                /* for retry wait for 1 ms till bus get settled down */
+                if (retry)
+                        usleep_range(1000, 2000);
+                ret = brcmf_sdiod_request_data(sdiodev, func_num, addr, regsz,
+                                               data, write);
+        } while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
 
-        if (err_ret)
-                brcmf_err("Failed to %s word, Err: 0x%08x\n",
-                          rw ? "write" : "read", err_ret);
+        if (ret != 0)
+                brcmf_err("failed with %d\n", ret);
 
-        return err_ret;
+        return ret;
 }
 
 static int
@@ -311,24 +319,17 @@ brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
 {
         int err = 0, i;
         u8 addr[3];
-        s32 retry;
 
         addr[0] = (address >> 8) & SBSDIO_SBADDRLOW_MASK;
         addr[1] = (address >> 16) & SBSDIO_SBADDRMID_MASK;
         addr[2] = (address >> 24) & SBSDIO_SBADDRHIGH_MASK;
 
         for (i = 0; i < 3; i++) {
-                retry = 0;
-                do {
-                        if (retry)
-                                usleep_range(1000, 2000);
-                        err = brcmf_sdiod_request_byte(sdiodev, SDIOH_WRITE,
-                                        SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW + i,
-                                        &addr[i]);
-                } while (err != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
-
+                err = brcmf_sdiod_regrw_helper(sdiodev,
+                                               SBSDIO_FUNC1_SBADDRLOW + i,
+                                               sizeof(u8), &addr[i], true);
                 if (err) {
-                        brcmf_err("failed at addr:0x%0x\n",
+                        brcmf_err("failed at addr: 0x%0x\n",
                                   SBSDIO_FUNC1_SBADDRLOW + i);
                         break;
                 }
@@ -359,61 +360,14 @@ brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)
         return 0;
 }
 
-static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
-                                    void *data, bool write)
-{
-        u8 func_num, reg_size;
-        s32 retry = 0;
-        int ret;
-
-        /*
-         * figure out how to read the register based on address range
-         * 0x00 ~ 0x7FF: function 0 CCCR and FBR
-         * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
-         * The rest: function 1 silicon backplane core registers
-         */
-        if ((addr & ~REG_F0_REG_MASK) == 0) {
-                func_num = SDIO_FUNC_0;
-                reg_size = 1;
-        } else if ((addr & ~REG_F1_MISC_MASK) == 0) {
-                func_num = SDIO_FUNC_1;
-                reg_size = 1;
-        } else {
-                func_num = SDIO_FUNC_1;
-                reg_size = 4;
-
-                ret = brcmf_sdiod_addrprep(sdiodev, reg_size, &addr);
-                if (ret)
-                        goto done;
-        }
-
-        do {
-                if (!write)
-                        memset(data, 0, reg_size);
-                if (retry)      /* wait for 1 ms till bus get settled down */
-                        usleep_range(1000, 2000);
-                if (reg_size == 1)
-                        ret = brcmf_sdiod_request_byte(sdiodev, write,
-                                                       func_num, addr, data);
-                else
-                        ret = brcmf_sdiod_request_word(sdiodev, write,
-                                                       func_num, addr, data, 4);
-        } while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
-
-done:
-        if (ret != 0)
-                brcmf_err("failed with %d\n", ret);
-
-        return ret;
-}
-
 u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
 {
         u8 data;
         int retval;
 
         brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
-        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, &data, false);
+        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, sizeof(data), &data,
+                                          false);
         brcmf_dbg(SDIO, "data:0x%02x\n", data);
 
         if (ret)
@@ -428,9 +382,14 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
         int retval;
 
         brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
-        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, &data, false);
+        retval = brcmf_sdiod_addrprep(sdiodev, sizeof(data), &addr);
+        if (retval)
+                goto done;
+        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, sizeof(data), &data,
+                                          false);
         brcmf_dbg(SDIO, "data:0x%08x\n", data);
 
+done:
         if (ret)
                 *ret = retval;
 
@@ -443,8 +402,8 @@ void brcmf_sdiod_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,
         int retval;
 
         brcmf_dbg(SDIO, "addr:0x%08x, data:0x%02x\n", addr, data);
-        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, &data, true);
-
+        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, sizeof(data), &data,
+                                          true);
         if (ret)
                 *ret = retval;
 }
@@ -455,8 +414,13 @@ void brcmf_sdiod_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
         int retval;
 
         brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
-        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, &data, true);
+        retval = brcmf_sdiod_addrprep(sdiodev, sizeof(data), &addr);
+        if (retval)
+                goto done;
+        retval = brcmf_sdiod_regrw_helper(sdiodev, addr, sizeof(data), &data,
+                                          true);
 
+done:
         if (ret)
                 *ret = retval;
 }
@@ -879,8 +843,8 @@ int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
         brcmf_dbg(SDIO, "Enter\n");
 
         /* issue abort cmd52 command through F0 */
-        brcmf_sdiod_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0,
-                                 SDIO_CCCR_ABORT, &t_func);
+        brcmf_sdiod_request_data(sdiodev, SDIO_FUNC_0, SDIO_CCCR_ABORT,
+                                 sizeof(t_func), &t_func, true);
 
         brcmf_dbg(SDIO, "Exit\n");
         return 0;
@@ -981,6 +945,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43362)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM,
                      SDIO_DEVICE_ID_BROADCOM_4335_4339)},
         { /* end: all zeroes */ },
@@ -1037,7 +1002,6 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
         sdiodev->pdata = brcmfmac_sdio_pdata;
 
         atomic_set(&sdiodev->suspend, false);
-        init_waitqueue_head(&sdiodev->request_byte_wait);
         init_waitqueue_head(&sdiodev->request_word_wait);
         init_waitqueue_head(&sdiodev->request_buffer_wait);
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 252024bcbc3b..939d6b132922 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -21,8 +21,6 @@
 #ifndef _BRCMF_H_
 #define _BRCMF_H_
 
-#define BRCMF_VERSION_STR               "4.218.248.5"
-
 #include "fweh.h"
 
 #define TOE_TX_CSUM_OL          0x00000001
@@ -39,6 +37,11 @@
 #define BRCMF_DCMD_MEDLEN       1536
 #define BRCMF_DCMD_MAXLEN       8192
 
+/* IOCTL from host to device are limited in lenght. A device can only handle
+ * ethernet frame size. This limitation is to be applied by protocol layer.
+ */
+#define BRCMF_TX_IOCTL_MAX_MSG_SIZE     (ETH_FRAME_LEN+ETH_FCS_LEN)
+
 #define BRCMF_AMPDU_RX_REORDER_MAXFLOWS         256
 
 /* Length of firmware version string stored for
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 548dbb5542c6..6a8983a1fb9c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -32,15 +32,6 @@
 #define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40
 #define BRCMF_DEFAULT_PACKET_FILTER     "100 0 0 0 0x01 0x00"
 
-#ifdef DEBUG
-static const char brcmf_version[] =
-        "Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on "
-        __DATE__ " at " __TIME__;
-#else
-static const char brcmf_version[] =
-        "Dongle Host Driver, version " BRCMF_VERSION_STR;
-#endif
-
 
 bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
                       struct sk_buff *pkt, int prec)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index bce0b8e511fd..af39edae8c62 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -702,7 +702,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
 
         brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);
 
-        ndev->destructor = free_netdev;
+        ndev->destructor = brcmf_cfg80211_free_netdev;
         return 0;
 
 fail:
@@ -859,8 +859,6 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)
                 }
                 /* unregister will take care of freeing it */
                 unregister_netdev(ifp->ndev);
-                if (bssidx == 0)
-                        brcmf_cfg80211_detach(drvr->config);
         } else {
                 kfree(ifp);
         }
@@ -963,8 +961,7 @@ int brcmf_bus_start(struct device *dev)
 fail:
         if (ret < 0) {
                 brcmf_err("failed: %d\n", ret);
-                if (drvr->config)
-                        brcmf_cfg80211_detach(drvr->config);
+                brcmf_cfg80211_detach(drvr->config);
                 if (drvr->fws) {
                         brcmf_fws_del_interface(ifp);
                         brcmf_fws_deinit(drvr);
@@ -1039,6 +1036,8 @@ void brcmf_detach(struct device *dev)
                         brcmf_del_if(drvr, i);
                 }
 
+        brcmf_cfg80211_detach(drvr->config);
+
         brcmf_bus_detach(drvr);
 
         brcmf_proto_detach(drvr);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index f214510e3bee..9c7f08a13105 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -509,6 +509,8 @@ enum brcmf_sdio_frmtype {
 #define BCM4334_NVRAM_NAME              "brcm/brcmfmac4334-sdio.txt"
 #define BCM4335_FIRMWARE_NAME           "brcm/brcmfmac4335-sdio.bin"
 #define BCM4335_NVRAM_NAME              "brcm/brcmfmac4335-sdio.txt"
+#define BCM43362_FIRMWARE_NAME          "brcm/brcmfmac43362-sdio.bin"
+#define BCM43362_NVRAM_NAME             "brcm/brcmfmac43362-sdio.txt"
 #define BCM4339_FIRMWARE_NAME           "brcm/brcmfmac4339-sdio.bin"
 #define BCM4339_NVRAM_NAME              "brcm/brcmfmac4339-sdio.txt"
 
@@ -526,6 +528,8 @@ MODULE_FIRMWARE(BCM4334_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM4334_NVRAM_NAME);
 MODULE_FIRMWARE(BCM4335_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM4335_NVRAM_NAME);
+MODULE_FIRMWARE(BCM43362_FIRMWARE_NAME);
+MODULE_FIRMWARE(BCM43362_NVRAM_NAME);
 MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
 MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
 
@@ -552,6 +556,7 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = {
         { BCM4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
         { BCM4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) },
         { BCM4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
+        { BCM43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
         { BCM4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) }
 };
 
@@ -3384,7 +3389,8 @@ err:
 
 static bool brcmf_sdio_sr_capable(struct brcmf_sdio *bus)
 {
-        u32 addr, reg;
+        u32 addr, reg, pmu_cc3_mask = ~0;
+        int err;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3392,13 +3398,27 @@ static bool brcmf_sdio_sr_capable(struct brcmf_sdio *bus)
         if (bus->ci->pmurev < 17)
                 return false;
 
-        /* read PMU chipcontrol register 3*/
-        addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_addr);
-        brcmf_sdiod_regwl(bus->sdiodev, addr, 3, NULL);
-        addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_data);
-        reg = brcmf_sdiod_regrl(bus->sdiodev, addr, NULL);
+        switch (bus->ci->chip) {
+        case BCM43241_CHIP_ID:
+        case BCM4335_CHIP_ID:
+        case BCM4339_CHIP_ID:
+                /* read PMU chipcontrol register 3 */
+                addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_addr);
+                brcmf_sdiod_regwl(bus->sdiodev, addr, 3, NULL);
+                addr = CORE_CC_REG(bus->ci->c_inf[0].base, chipcontrol_data);
+                reg = brcmf_sdiod_regrl(bus->sdiodev, addr, NULL);
+                return (reg & pmu_cc3_mask) != 0;
+        default:
+                addr = CORE_CC_REG(bus->ci->c_inf[0].base, pmucapabilities_ext);
+                reg = brcmf_sdiod_regrl(bus->sdiodev, addr, &err);
+                if ((reg & PCAPEXT_SR_SUPPORTED_MASK) == 0)
+                        return false;
 
-        return (bool)reg;
+                addr = CORE_CC_REG(bus->ci->c_inf[0].base, retention_ctl);
+                reg = brcmf_sdiod_regrl(bus->sdiodev, addr, NULL);
+                return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK |
+                               PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
+        }
 }
 
 static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)
@@ -3615,7 +3635,7 @@ static int brcmf_sdio_bus_init(struct device *dev)
         }
 
         /* If we didn't come up, turn off backplane clock */
-        if (bus_if->state != BRCMF_BUS_DATA)
+        if (ret != 0)
                 brcmf_sdio_clkctl(bus, CLK_NONE, false);
 
 exit:
@@ -3750,31 +3770,6 @@ static void brcmf_sdio_dataworker(struct work_struct *work)
         }
 }
 
-static void brcmf_sdio_release_malloc(struct brcmf_sdio *bus)
-{
-        brcmf_dbg(TRACE, "Enter\n");
-
-        kfree(bus->rxbuf);
-        bus->rxctl = bus->rxbuf = NULL;
-        bus->rxlen = 0;
-}
-
-static bool brcmf_sdio_probe_malloc(struct brcmf_sdio *bus)
-{
-        brcmf_dbg(TRACE, "Enter\n");
-
-        if (bus->sdiodev->bus_if->maxctl) {
-                bus->rxblen =
-                    roundup((bus->sdiodev->bus_if->maxctl + SDPCM_HDRLEN),
-                            ALIGNMENT) + bus->head_align;
-                bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC);
-                if (!(bus->rxbuf))
-                        return false;
-        }
-
-        return true;
-}
-
 static bool
 brcmf_sdio_probe_attach(struct brcmf_sdio *bus)
 {
@@ -3888,39 +3883,6 @@ fail:
         return false;
 }
 
-static bool brcmf_sdio_probe_init(struct brcmf_sdio *bus)
-{
-        brcmf_dbg(TRACE, "Enter\n");
-
-        sdio_claim_host(bus->sdiodev->func[1]);
-
-        /* Disable F2 to clear any intermediate frame state on the dongle */
-        sdio_disable_func(bus->sdiodev->func[SDIO_FUNC_2]);
-
-        bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
-        bus->rxflow = false;
-
-        /* Done with backplane-dependent accesses, can drop clock... */
-        brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
-
-        sdio_release_host(bus->sdiodev->func[1]);
-
-        /* ...and initialize clock/power states */
-        bus->clkstate = CLK_SDONLY;
-        bus->idletime = BRCMF_IDLE_INTERVAL;
-        bus->idleclock = BRCMF_IDLE_ACTIVE;
-
-        /* Query the F2 block size, set roundup accordingly */
-        bus->blocksize = bus->sdiodev->func[2]->cur_blksize;
-        bus->roundup = min(max_roundup, bus->blocksize);
-
-        /* SR state */
-        bus->sleeping = false;
-        bus->sr_enabled = false;
-
-        return true;
-}
-
 static int
 brcmf_sdio_watchdog_thread(void *data)
 {
@@ -3955,24 +3917,6 @@ brcmf_sdio_watchdog(unsigned long data)
         }
 }
 
-static void brcmf_sdio_release_dongle(struct brcmf_sdio *bus)
-{
-        brcmf_dbg(TRACE, "Enter\n");
-
-        if (bus->ci) {
-                sdio_claim_host(bus->sdiodev->func[1]);
-                brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
-                brcmf_sdio_clkctl(bus, CLK_NONE, false);
-                sdio_release_host(bus->sdiodev->func[1]);
-                brcmf_sdio_chip_detach(&bus->ci);
-                if (bus->vars && bus->varsz)
-                        kfree(bus->vars);
-                bus->vars = NULL;
-        }
-
-        brcmf_dbg(TRACE, "Disconnected\n");
-}
-
 static struct brcmf_bus_ops brcmf_sdio_bus_ops = {
         .stop = brcmf_sdio_bus_stop,
         .preinit = brcmf_sdio_bus_preinit,
@@ -4066,15 +4010,42 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
         }
 
         /* Allocate buffers */
-        if (!(brcmf_sdio_probe_malloc(bus))) {
-                brcmf_err("brcmf_sdio_probe_malloc failed\n");
-                goto fail;
+        if (bus->sdiodev->bus_if->maxctl) {
+                bus->rxblen =
+                    roundup((bus->sdiodev->bus_if->maxctl + SDPCM_HDRLEN),
+                            ALIGNMENT) + bus->head_align;
+                bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC);
+                if (!(bus->rxbuf)) {
+                        brcmf_err("rxbuf allocation failed\n");
+                        goto fail;
+                }
         }
 
-        if (!(brcmf_sdio_probe_init(bus))) {
-                brcmf_err("brcmf_sdio_probe_init failed\n");
-                goto fail;
-        }
+        sdio_claim_host(bus->sdiodev->func[1]);
+
+        /* Disable F2 to clear any intermediate frame state on the dongle */
+        sdio_disable_func(bus->sdiodev->func[SDIO_FUNC_2]);
+
+        bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
+        bus->rxflow = false;
+
+        /* Done with backplane-dependent accesses, can drop clock... */
+        brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
+
+        sdio_release_host(bus->sdiodev->func[1]);
+
+        /* ...and initialize clock/power states */
+        bus->clkstate = CLK_SDONLY;
+        bus->idletime = BRCMF_IDLE_INTERVAL;
+        bus->idleclock = BRCMF_IDLE_ACTIVE;
+
+        /* Query the F2 block size, set roundup accordingly */
+        bus->blocksize = bus->sdiodev->func[2]->cur_blksize;
+        bus->roundup = min(max_roundup, bus->blocksize);
+
+        /* SR state */
+        bus->sleeping = false;
+        bus->sr_enabled = false;
 
         brcmf_sdio_debugfs_create(bus);
         brcmf_dbg(INFO, "completed!!\n");
@@ -4108,12 +4079,20 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
 
                 if (bus->sdiodev->bus_if->drvr) {
                         brcmf_detach(bus->sdiodev->dev);
-                        brcmf_sdio_release_dongle(bus);
+                }
+
+                if (bus->ci) {
+                        sdio_claim_host(bus->sdiodev->func[1]);
+                        brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
+                        brcmf_sdio_clkctl(bus, CLK_NONE, false);
+                        sdio_release_host(bus->sdiodev->func[1]);
+                        brcmf_sdio_chip_detach(&bus->ci);
                 }
 
                 brcmu_pkt_buf_free_skb(bus->txglom_sgpad);
-                brcmf_sdio_release_malloc(bus);
+                kfree(bus->rxbuf);
                 kfree(bus->hdrbuf);
+                kfree(bus->vars);
                 kfree(bus);
         }
 
@@ -4131,7 +4110,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick)
         }
 
         /* don't start the wd until fw is loaded */
-        if (bus->sdiodev->bus_if->state == BRCMF_BUS_DOWN)
+        if (bus->sdiodev->bus_if->state != BRCMF_BUS_DATA)
                 return;
 
         if (wdtick) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 7918c1033662..c3e7d76dbf35 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1873,7 +1873,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
         brcmf_dbg(DATA, "tx proto=0x%X\n", ntohs(eh->h_proto));
         /* determine the priority */
         if (!skb->priority)
-                skb->priority = cfg80211_classify8021d(skb);
+                skb->priority = cfg80211_classify8021d(skb, NULL);
 
         drvr->tx_multicast += !!multicast;
         if (pae)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 185af8a84c9a..fc4f98b275d7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -1955,21 +1955,21 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg)
                 err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
                 if (err < 0) {
                         brcmf_err("set p2p_disc error\n");
-                        brcmf_free_vif(cfg, p2p_vif);
+                        brcmf_free_vif(p2p_vif);
                         goto exit;
                 }
                 /* obtain bsscfg index for P2P discovery */
                 err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bssidx);
                 if (err < 0) {
                         brcmf_err("retrieving discover bsscfg index failed\n");
-                        brcmf_free_vif(cfg, p2p_vif);
+                        brcmf_free_vif(p2p_vif);
                         goto exit;
                 }
                 /* Verify that firmware uses same bssidx as driver !! */
                 if (p2p_ifp->bssidx != bssidx) {
                         brcmf_err("Incorrect bssidx=%d, compared to p2p_ifp->bssidx=%d\n",
                                   bssidx, p2p_ifp->bssidx);
-                        brcmf_free_vif(cfg, p2p_vif);
+                        brcmf_free_vif(p2p_vif);
                         goto exit;
                 }
 
@@ -1997,7 +1997,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_info *p2p)
                 brcmf_p2p_cancel_remain_on_channel(vif->ifp);
                 brcmf_p2p_deinit_discovery(p2p);
                 /* remove discovery interface */
-                brcmf_free_vif(p2p->cfg, vif);
+                brcmf_free_vif(vif);
                 p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
         }
         /* just set it all to zero */
@@ -2222,7 +2222,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
         return &p2p_vif->wdev;
 
 fail:
-        brcmf_free_vif(p2p->cfg, p2p_vif);
+        brcmf_free_vif(p2p_vif);
         return ERR_PTR(err);
 }
 
@@ -2231,31 +2231,12 @@ fail:
  *
  * @vif: virtual interface object to delete.
  */
-static void brcmf_p2p_delete_p2pdev(struct brcmf_cfg80211_info *cfg,
+static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p,
                                     struct brcmf_cfg80211_vif *vif)
 {
         cfg80211_unregister_wdev(&vif->wdev);
-        cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
-        brcmf_free_vif(cfg, vif);
-}
-
-/**
- * brcmf_p2p_free_p2p_if() - free up net device related data.
- *
- * @ndev: net device that needs to be freed.
- */
-static void brcmf_p2p_free_p2p_if(struct net_device *ndev)
-{
-        struct brcmf_cfg80211_info *cfg;
-        struct brcmf_cfg80211_vif *vif;
-        struct brcmf_if *ifp;
-
-        ifp = netdev_priv(ndev);
-        cfg = ifp->drvr->config;
-        vif = ifp->vif;
-
-        brcmf_free_vif(cfg, vif);
-        free_netdev(ifp->ndev);
+        p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
+        brcmf_free_vif(vif);
 }
 
 /**
@@ -2335,8 +2316,6 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
                 brcmf_err("Registering netdevice failed\n");
                 goto fail;
         }
-        /* override destructor */
-        ifp->ndev->destructor = brcmf_p2p_free_p2p_if;
 
         cfg->p2p.bss_idx[P2PAPI_BSSCFG_CONNECTION].vif = vif;
         /* Disable firmware roaming for P2P interface  */
@@ -2349,7 +2328,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
         return &ifp->vif->wdev;
 
 fail:
-        brcmf_free_vif(cfg, vif);
+        brcmf_free_vif(vif);
         return ERR_PTR(err);
 }
 
@@ -2358,8 +2337,6 @@ fail:
  *
  * @wiphy: wiphy device of interface.
  * @wdev: wireless device of interface.
- *
- * TODO: not yet supported.
  */
 int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
 {
@@ -2385,7 +2362,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
                 break;
 
         case NL80211_IFTYPE_P2P_DEVICE:
-                brcmf_p2p_delete_p2pdev(cfg, vif);
+                brcmf_p2p_delete_p2pdev(p2p, vif);
                 return 0;
         default:
                 return -ENOTSUPP;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 5f39f28e6efb..9fd40675f18e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -19,6 +19,7 @@
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/bcma/bcma.h>
 
@@ -83,6 +84,24 @@ static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = {
         {0, 0x1}
 };
 
+/* SDIO Drive Strength to sel value table for PMU Rev 13 (1.8v) */
+static const struct sdiod_drive_str sdiod_drive_strength_tab5_1v8[] = {
+        {6, 0x7},
+        {5, 0x6},
+        {4, 0x5},
+        {3, 0x4},
+        {2, 0x2},
+        {1, 0x1},
+        {0, 0x0}
+};
+
+/* SDIO Drive Strength to sel value table for PMU Rev 17 (1.8v) */
+static const struct sdiod_drive_str sdiod_drvstr_tab6_1v8[] = {
+        {3, 0x3},
+        {2, 0x2},
+        {1, 0x1},
+        {0, 0x0} };
+
 /* SDIO Drive Strength to sel value table for 43143 PMU Rev 17 (3.3V) */
 static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
         {16, 0x7},
@@ -569,6 +588,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                 ci->ramsize = 0xc0000;
                 ci->rambase = 0x180000;
                 break;
+        case BCM43362_CHIP_ID:
+                ci->c_inf[0].wrapbase = 0x18100000;
+                ci->c_inf[0].cib = 0x27004211;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = 0x18002000;
+                ci->c_inf[1].wrapbase = 0x18102000;
+                ci->c_inf[1].cib = 0x0a004211;
+                ci->c_inf[2].id = BCMA_CORE_INTERNAL_MEM;
+                ci->c_inf[2].base = 0x18004000;
+                ci->c_inf[2].wrapbase = 0x18104000;
+                ci->c_inf[2].cib = 0x08080401;
+                ci->c_inf[3].id = BCMA_CORE_ARM_CM3;
+                ci->c_inf[3].base = 0x18003000;
+                ci->c_inf[3].wrapbase = 0x18103000;
+                ci->c_inf[3].cib = 0x03004211;
+                ci->ramsize = 0x3C000;
+                break;
         default:
                 brcmf_err("chipid 0x%x is not supported\n", ci->chip);
                 return -ENODEV;
@@ -757,6 +793,11 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                 str_mask = 0x00003800;
                 str_shift = 11;
                 break;
+        case SDIOD_DRVSTR_KEY(BCM4334_CHIP_ID, 17):
+                str_tab = sdiod_drvstr_tab6_1v8;
+                str_mask = 0x00001800;
+                str_shift = 11;
+                break;
         case SDIOD_DRVSTR_KEY(BCM43143_CHIP_ID, 17):
                 /* note: 43143 does not support tristate */
                 i = ARRAY_SIZE(sdiod_drvstr_tab2_3v3) - 1;
@@ -769,6 +810,11 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                                   brcmf_sdio_chip_name(ci->chip, chn, 8),
                                   drivestrength);
                 break;
+        case SDIOD_DRVSTR_KEY(BCM43362_CHIP_ID, 13):
+                str_tab = sdiod_drive_strength_tab5_1v8;
+                str_mask = 0x00003800;
+                str_shift = 11;
+                break;
         default:
                 brcmf_err("No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",
                           brcmf_sdio_chip_name(ci->chip, chn, 8),
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
index d0f4b45b24c7..7ea424e20773 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
@@ -54,14 +54,6 @@
 
 #define BRCMF_MAX_CORENUM       6
 
-/* SDIO device ID */
-#define SDIO_DEVICE_ID_BROADCOM_43143           43143
-#define SDIO_DEVICE_ID_BROADCOM_43241           0x4324
-#define SDIO_DEVICE_ID_BROADCOM_4329            0x4329
-#define SDIO_DEVICE_ID_BROADCOM_4330            0x4330
-#define SDIO_DEVICE_ID_BROADCOM_4334            0x4334
-#define SDIO_DEVICE_ID_BROADCOM_4335_4339       0x4335
-
 struct chip_core_info {
         u16 id;
         u16 rev;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index a0981b32c729..092e9c824992 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -167,7 +167,6 @@ struct brcmf_sdio_dev {
         u32 sbwad;                      /* Save backplane window address */
         struct brcmf_sdio *bus;
         atomic_t suspend;               /* suspend flag */
-        wait_queue_head_t request_byte_wait;
         wait_queue_head_t request_word_wait;
         wait_queue_head_t request_buffer_wait;
         struct device *dev;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 3966fe0fcfd9..aad83aef7d93 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -1095,10 +1095,10 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif)
                                              BRCMF_C_DISASSOC, NULL, 0);
                 if (err) {
                         brcmf_err("WLC_DISASSOC failed (%d)\n", err);
-                        cfg80211_disconnected(vif->wdev.netdev, 0,
-                                              NULL, 0, GFP_KERNEL);
                 }
                 clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state);
+                cfg80211_disconnected(vif->wdev.netdev, 0, NULL, 0, GFP_KERNEL);
+
         }
         clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);
         clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
@@ -1758,6 +1758,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
                 return -EIO;
 
         clear_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state);
+        cfg80211_disconnected(ndev, reason_code, NULL, 0, GFP_KERNEL);
 
         memcpy(&scbval.ea, &profile->bssid, ETH_ALEN);
         scbval.val = cpu_to_le32(reason_code);
@@ -4359,9 +4360,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
 {
         struct brcmf_cfg80211_vif *vif;
 
-        if (cfg->vif_cnt == BRCMF_IFACE_MAX_CNT)
-                return ERR_PTR(-ENOSPC);
-
         brcmf_dbg(TRACE, "allocating virtual interface (size=%zu)\n",
                   sizeof(*vif));
         vif = kzalloc(sizeof(*vif), GFP_KERNEL);
@@ -4378,21 +4376,25 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
         brcmf_init_prof(&vif->profile);
 
         list_add_tail(&vif->list, &cfg->vif_list);
-        cfg->vif_cnt++;
         return vif;
 }
 
-void brcmf_free_vif(struct brcmf_cfg80211_info *cfg,
-                    struct brcmf_cfg80211_vif *vif)
+void brcmf_free_vif(struct brcmf_cfg80211_vif *vif)
 {
         list_del(&vif->list);
-        cfg->vif_cnt--;
-
         kfree(vif);
-        if (!cfg->vif_cnt) {
-                wiphy_unregister(cfg->wiphy);
-                wiphy_free(cfg->wiphy);
-        }
+}
+
+void brcmf_cfg80211_free_netdev(struct net_device *ndev)
+{
+        struct brcmf_cfg80211_vif *vif;
+        struct brcmf_if *ifp;
+
+        ifp = netdev_priv(ndev);
+        vif = ifp->vif;
+
+        brcmf_free_vif(vif);
+        free_netdev(ndev);
 }
 
 static bool brcmf_is_linkup(const struct brcmf_event_msg *e)
@@ -4979,20 +4981,20 @@ cfg80211_p2p_attach_out:
         wl_deinit_priv(cfg);
 
 cfg80211_attach_out:
-        brcmf_free_vif(cfg, vif);
+        brcmf_free_vif(vif);
         return NULL;
 }
 
 void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
 {
-        struct brcmf_cfg80211_vif *vif;
-        struct brcmf_cfg80211_vif *tmp;
+        if (!cfg)
+                return;
 
-        wl_deinit_priv(cfg);
+        WARN_ON(!list_empty(&cfg->vif_list));
+        wiphy_unregister(cfg->wiphy);
         brcmf_btcoex_detach(cfg);
-        list_for_each_entry_safe(vif, tmp, &cfg->vif_list, list) {
-                brcmf_free_vif(cfg, vif);
-        }
+        wl_deinit_priv(cfg);
+        wiphy_free(cfg->wiphy);
 }
 
 static s32
@@ -5087,7 +5089,8 @@ dongle_scantime_out:
 }
 
 
-static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
+static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg,
+                                   u32 bw_cap[])
 {
         struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
         struct ieee80211_channel *band_chan_arr;
@@ -5100,7 +5103,6 @@ static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
         enum ieee80211_band band;
         u32 channel;
         u32 *n_cnt;
-        bool ht40_allowed;
         u32 index;
         u32 ht40_flag;
         bool update;
@@ -5133,18 +5135,17 @@ static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
                         array_size = ARRAY_SIZE(__wl_2ghz_channels);
                         n_cnt = &__wl_band_2ghz.n_channels;
                         band = IEEE80211_BAND_2GHZ;
-                        ht40_allowed = (bw_cap == WLC_N_BW_40ALL);
                 } else if (ch.band == BRCMU_CHAN_BAND_5G) {
                         band_chan_arr = __wl_5ghz_a_channels;
                         array_size = ARRAY_SIZE(__wl_5ghz_a_channels);
                         n_cnt = &__wl_band_5ghz_a.n_channels;
                         band = IEEE80211_BAND_5GHZ;
-                        ht40_allowed = !(bw_cap == WLC_N_BW_20ALL);
                 } else {
-                        brcmf_err("Invalid channel Sepc. 0x%x.\n", ch.chspec);
+                        brcmf_err("Invalid channel Spec. 0x%x.\n", ch.chspec);
                         continue;
                 }
-                if (!ht40_allowed && ch.bw == BRCMU_CHAN_BW_40)
+                if (!(bw_cap[band] & WLC_BW_40MHZ_BIT) &&
+                    ch.bw == BRCMU_CHAN_BW_40)
                         continue;
                 update = false;
                 for (j = 0; (j < *n_cnt && (*n_cnt < array_size)); j++) {
@@ -5162,7 +5163,10 @@ static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap)
                                 ieee80211_channel_to_frequency(ch.chnum, band);
                         band_chan_arr[index].hw_value = ch.chnum;
 
-                        if (ch.bw == BRCMU_CHAN_BW_40 && ht40_allowed) {
+                        brcmf_err("channel %d: f=%d bw=%d sb=%d\n",
+                                  ch.chnum, band_chan_arr[index].center_freq,
+                                  ch.bw, ch.sb);
+                        if (ch.bw == BRCMU_CHAN_BW_40) {
                                 /* assuming the order is HT20, HT40 Upper,
                                  * HT40 lower from chanspecs
                                  */
@@ -5213,6 +5217,46 @@ exit:
         return err;
 }
 
+static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
+{
+        u32 band, mimo_bwcap;
+        int err;
+
+        band = WLC_BAND_2G;
+        err = brcmf_fil_iovar_int_get(ifp, "bw_cap", &band);
+        if (!err) {
+                bw_cap[IEEE80211_BAND_2GHZ] = band;
+                band = WLC_BAND_5G;
+                err = brcmf_fil_iovar_int_get(ifp, "bw_cap", &band);
+                if (!err) {
+                        bw_cap[IEEE80211_BAND_5GHZ] = band;
+                        return;
+                }
+                WARN_ON(1);
+                return;
+        }
+        brcmf_dbg(INFO, "fallback to mimo_bw_cap info\n");
+        mimo_bwcap = 0;
+        err = brcmf_fil_iovar_int_get(ifp, "mimo_bw_cap", &mimo_bwcap);
+        if (err)
+                /* assume 20MHz if firmware does not give a clue */
+                mimo_bwcap = WLC_N_BW_20ALL;
+
+        switch (mimo_bwcap) {
+        case WLC_N_BW_40ALL:
+                bw_cap[IEEE80211_BAND_2GHZ] |= WLC_BW_40MHZ_BIT;
+                /* fall-thru */
+        case WLC_N_BW_20IN2G_40IN5G:
+                bw_cap[IEEE80211_BAND_5GHZ] |= WLC_BW_40MHZ_BIT;
+                /* fall-thru */
+        case WLC_N_BW_20ALL:
+                bw_cap[IEEE80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT;
+                bw_cap[IEEE80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;
+                break;
+        default:
+                brcmf_err("invalid mimo_bw_cap value\n");
+        }
+}
 
 static s32 brcmf_update_wiphybands(struct brcmf_cfg80211_info *cfg)
 {
@@ -5221,13 +5265,13 @@ static s32 brcmf_update_wiphybands(struct brcmf_cfg80211_info *cfg)
         s32 phy_list;
         u32 band_list[3];
         u32 nmode;
-        u32 bw_cap = 0;
+        u32 bw_cap[2] = { 0, 0 };
         s8 phy;
         s32 err;
         u32 nband;
         s32 i;
-        struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS];
-        s32 index;
+        struct ieee80211_supported_band *bands[2] = { NULL, NULL };
+        struct ieee80211_supported_band *band;
 
         err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_PHYLIST,
                                      &phy_list, sizeof(phy_list));
@@ -5253,11 +5297,10 @@ static s32 brcmf_update_wiphybands(struct brcmf_cfg80211_info *cfg)
         if (err) {
                 brcmf_err("nmode error (%d)\n", err);
         } else {
-                err = brcmf_fil_iovar_int_get(ifp, "mimo_bw_cap", &bw_cap);
-                if (err)
-                        brcmf_err("mimo_bw_cap error (%d)\n", err);
+                brcmf_get_bwcap(ifp, bw_cap);
         }
-        brcmf_dbg(INFO, "nmode=%d, mimo_bw_cap=%d\n", nmode, bw_cap);
+        brcmf_dbg(INFO, "nmode=%d, bw_cap=(%d, %d)\n", nmode,
+                  bw_cap[IEEE80211_BAND_2GHZ], bw_cap[IEEE80211_BAND_5GHZ]);
 
         err = brcmf_construct_reginfo(cfg, bw_cap);
         if (err) {
@@ -5266,40 +5309,33 @@ static s32 brcmf_update_wiphybands(struct brcmf_cfg80211_info *cfg)
         }
 
         nband = band_list[0];
-        memset(bands, 0, sizeof(bands));
 
         for (i = 1; i <= nband && i < ARRAY_SIZE(band_list); i++) {
-                index = -1;
+                band = NULL;
                 if ((band_list[i] == WLC_BAND_5G) &&
-                    (__wl_band_5ghz_a.n_channels > 0)) {
-                        index = IEEE80211_BAND_5GHZ;
-                        bands[index] = &__wl_band_5ghz_a;
-                        if ((bw_cap == WLC_N_BW_40ALL) ||
-                            (bw_cap == WLC_N_BW_20IN2G_40IN5G))
-                                bands[index]->ht_cap.cap |=
-                                                        IEEE80211_HT_CAP_SGI_40;
-                } else if ((band_list[i] == WLC_BAND_2G) &&
-                           (__wl_band_2ghz.n_channels > 0)) {
-                        index = IEEE80211_BAND_2GHZ;
-                        bands[index] = &__wl_band_2ghz;
-                        if (bw_cap == WLC_N_BW_40ALL)
-                                bands[index]->ht_cap.cap |=
-                                                        IEEE80211_HT_CAP_SGI_40;
-                }
+                    (__wl_band_5ghz_a.n_channels > 0))
+                        band = &__wl_band_5ghz_a;
+                else if ((band_list[i] == WLC_BAND_2G) &&
+                         (__wl_band_2ghz.n_channels > 0))
+                        band = &__wl_band_2ghz;
+                else
+                        continue;
 
-                if ((index >= 0) && nmode) {
-                        bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
-                        bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;
-                        bands[index]->ht_cap.ht_supported = true;
-                        bands[index]->ht_cap.ampdu_factor =
-                                                IEEE80211_HT_MAX_AMPDU_64K;
-                        bands[index]->ht_cap.ampdu_density =
-                                                IEEE80211_HT_MPDU_DENSITY_16;
-                        /* An HT shall support all EQM rates for one spatial
-                         * stream
-                         */
-                        bands[index]->ht_cap.mcs.rx_mask[0] = 0xff;
+                if (bw_cap[band->band] & WLC_BW_40MHZ_BIT) {
+                        band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
+                        band->ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
                 }
+                band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
+                band->ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;
+                band->ht_cap.ht_supported = true;
+                band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+                band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16;
+                /* An HT shall support all EQM rates for one spatial
+                 * stream
+                 */
+                band->ht_cap.mcs.rx_mask[0] = 0xff;
+                band->ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+                bands[band->band] = band;
         }
 
         wiphy = cfg_to_wiphy(cfg);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index d9bdaf9a72d0..2dc6a074e8ed 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -412,7 +412,6 @@ struct brcmf_cfg80211_info {
         struct work_struct escan_timeout_work;
         u8 *escan_ioctl_buf;
         struct list_head vif_list;
-        u8 vif_cnt;
         struct brcmf_cfg80211_vif_event vif_event;
         struct completion vif_disabled;
         struct brcmu_d11inf d11inf;
@@ -487,8 +486,7 @@ enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
 struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
                                            enum nl80211_iftype type,
                                            bool pm_block);
-void brcmf_free_vif(struct brcmf_cfg80211_info *cfg,
-                    struct brcmf_cfg80211_vif *vif);
+void brcmf_free_vif(struct brcmf_cfg80211_vif *vif);
 
 s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
                           const u8 *vndr_ie_buf, u32 vndr_ie_len);
@@ -507,5 +505,6 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                                 bool fw_abort);
 void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);
 void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);
+void brcmf_cfg80211_free_netdev(struct net_device *ndev);
 
 #endif                          /* _wl_cfg80211_h_ */
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 84113ea16f84..6fa5d4863782 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -41,6 +41,7 @@
 #define BCM4331_CHIP_ID         0x4331
 #define BCM4334_CHIP_ID         0x4334
 #define BCM4335_CHIP_ID         0x4335
+#define BCM43362_CHIP_ID        43362
 #define BCM4339_CHIP_ID         0x4339
 
 #endif                          /* _BRCM_HW_IDS_H_ */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
index 0505cc065e0d..7ca2aa1035b2 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h
@@ -82,6 +82,20 @@
 #define WLC_N_BW_40ALL                  1
 #define WLC_N_BW_20IN2G_40IN5G          2
 
+#define WLC_BW_20MHZ_BIT                BIT(0)
+#define WLC_BW_40MHZ_BIT                BIT(1)
+#define WLC_BW_80MHZ_BIT                BIT(2)
+#define WLC_BW_160MHZ_BIT               BIT(3)
+
+/* Bandwidth capabilities */
+#define WLC_BW_CAP_20MHZ                (WLC_BW_20MHZ_BIT)
+#define WLC_BW_CAP_40MHZ                (WLC_BW_40MHZ_BIT|WLC_BW_20MHZ_BIT)
+#define WLC_BW_CAP_80MHZ                (WLC_BW_80MHZ_BIT|WLC_BW_40MHZ_BIT| \
+                                         WLC_BW_20MHZ_BIT)
+#define WLC_BW_CAP_160MHZ               (WLC_BW_160MHZ_BIT|WLC_BW_80MHZ_BIT| \
+                                         WLC_BW_40MHZ_BIT|WLC_BW_20MHZ_BIT)
+#define WLC_BW_CAP_UNRESTRICTED         0xFF
+
 /* band types */
 #define WLC_BAND_AUTO                   0       /* auto-select */
 #define WLC_BAND_5G                     1       /* 5 Ghz */
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/cw1200/fwio.c
index acdff0f7f952..5a9ffd3a6a6c 100644
--- a/drivers/net/wireless/cw1200/fwio.c
+++ b/drivers/net/wireless/cw1200/fwio.c
@@ -14,7 +14,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c
index 090f01577dd2..d1270da4dfea 100644
--- a/drivers/net/wireless/cw1200/main.c
+++ b/drivers/net/wireless/cw1200/main.c
@@ -21,7 +21,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/net/wireless/cw1200/pm.c b/drivers/net/wireless/cw1200/pm.c
index b37abb9f0453..6907c8fd4578 100644
--- a/drivers/net/wireless/cw1200/pm.c
+++ b/drivers/net/wireless/cw1200/pm.c
@@ -225,7 +225,7 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                 cw1200_set_pm(priv, &priv->powersave_mode);
                 if (wait_event_interruptible_timeout(priv->ps_mode_switch_done,
                                                      !priv->ps_mode_switch_in_progress, 1*HZ) <= 0) {
-                        goto revert3;
+                        goto revert4;
                 }
         }
 
@@ -254,11 +254,11 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 
         /* Stop serving thread */
         if (cw1200_bh_suspend(priv))
-                goto revert4;
+                goto revert5;
 
         ret = timer_pending(&priv->mcast_timeout);
         if (ret)
-                goto revert5;
+                goto revert6;
 
         /* Store suspend state */
         pm_state->suspend_state = state;
@@ -280,9 +280,9 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 
         return 0;
 
-revert5:
+revert6:
         WARN_ON(cw1200_bh_resume(priv));
-revert4:
+revert5:
         cw1200_resume_work(priv, &priv->bss_loss_work,
                            state->bss_loss_tmo);
         cw1200_resume_work(priv, &priv->join_timeout,
@@ -291,6 +291,7 @@ revert4:
                            state->direct_probe);
         cw1200_resume_work(priv, &priv->link_id_gc_work,
                            state->link_id_gc);
+revert4:
         kfree(state);
 revert3:
         wsm_set_udp_port_filter(priv, &cw1200_udp_port_filter_off);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 56cd01ca8ad0..9f825f2620da 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -1,7 +1,6 @@
 #define PRISM2_PCCARD
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/if.h>
 #include <linux/slab.h>
 #include <linux/wait.h>
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 2454a740ea50..3e5fa7872b64 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -2567,7 +2567,7 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
                 local->passive_scan_interval = value;
                 if (timer_pending(&local->passive_scan_timer))
                         del_timer(&local->passive_scan_timer);
-                if (value > 0) {
+                if (value > 0 && value < INT_MAX / HZ) {
                         local->passive_scan_timer.expires = jiffies +
                                 local->passive_scan_interval * HZ;
                         add_timer(&local->passive_scan_timer);
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 05ca3402dca7..91158e2e961c 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -5,7 +5,6 @@
  * Andy Warner <andyw@pobox.com> */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index c3d067ee4db9..3bf530d9a40f 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -8,7 +8,6 @@
 
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h
index 570d6fb88967..aa301d1eee3c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/drivers/net/wireless/ipw2x00/ipw2200.h
@@ -29,7 +29,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 5c6253811c52..a586a85bfcfe 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -1468,7 +1468,7 @@ static inline int is_same_network(struct libipw_network *src,
          * as one network */
         return ((src->ssid_len == dst->ssid_len) &&
                 (src->channel == dst->channel) &&
-                ether_addr_equal(src->bssid, dst->bssid) &&
+                ether_addr_equal_64bits(src->bssid, dst->bssid) &&
                 !memcmp(src->ssid, dst->ssid, src->ssid_len));
 }
 
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index aea667b430c3..9a45f6f626f6 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -25,7 +25,6 @@
  *****************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index f09e257759d5..d37a6fd90d40 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -466,10 +465,10 @@ il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)
         switch (il->iw_mode) {
         case NL80211_IFTYPE_ADHOC:      /* Header: Dest. | Source    | BSSID */
                 /* packets to our IBSS update information */
-                return ether_addr_equal(header->addr3, il->bssid);
+                return ether_addr_equal_64bits(header->addr3, il->bssid);
         case NL80211_IFTYPE_STATION:    /* Header: Dest. | AP{BSSID} | Source */
                 /* packets to our IBSS update information */
-                return ether_addr_equal(header->addr2, il->bssid);
+                return ether_addr_equal_64bits(header->addr2, il->bssid);
         default:
                 return 1;
         }
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index 3ccbaf791b48..4d5e33259ca8 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -24,7 +24,6 @@
  *
  *****************************************************************************/
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 777a578294bd..fe47db9c20cd 100644
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index a27b14cfeaec..02e8233ccf29 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/lockdep.h>
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
@@ -3746,10 +3745,10 @@ il_full_rxon_required(struct il_priv *il)
 
         /* These items are only settable from the full RXON command */
         CHK(!il_is_associated(il));
-        CHK(!ether_addr_equal(staging->bssid_addr, active->bssid_addr));
-        CHK(!ether_addr_equal(staging->node_addr, active->node_addr));
-        CHK(!ether_addr_equal(staging->wlap_bssid_addr,
-                              active->wlap_bssid_addr));
+        CHK(!ether_addr_equal_64bits(staging->bssid_addr, active->bssid_addr));
+        CHK(!ether_addr_equal_64bits(staging->node_addr, active->node_addr));
+        CHK(!ether_addr_equal_64bits(staging->wlap_bssid_addr,
+                                     active->wlap_bssid_addr));
         CHK_NEQ(staging->dev_type, active->dev_type);
         CHK_NEQ(staging->channel, active->channel);
         CHK_NEQ(staging->air_propagation, active->air_propagation);
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 23d5f0275ce9..562772d85102 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.c b/drivers/net/wireless/iwlwifi/dvm/calib.c
index 1b0f0d502568..be1086c87157 100644
--- a/drivers/net/wireless/iwlwifi/dvm/calib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.h b/drivers/net/wireless/iwlwifi/dvm/calib.h
index cfddde194940..aeae4e80ea40 100644
--- a/drivers/net/wireless/iwlwifi/dvm/calib.h
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index ebdac909f0cd..751ae1d10b7f 100644
--- a/drivers/net/wireless/iwlwifi/dvm/commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index f69301e505ee..d2fe2596d54e 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 7434d9edf3b7..3441f70d0ff9 100644
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 352c6cb7b4f1..7b140e487deb 100644
--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/led.c b/drivers/net/wireless/iwlwifi/dvm/led.c
index 33c7e15d24f5..ca4d6692cc4e 100644
--- a/drivers/net/wireless/iwlwifi/dvm/led.c
+++ b/drivers/net/wireless/iwlwifi/dvm/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -27,7 +27,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/iwlwifi/dvm/led.h b/drivers/net/wireless/iwlwifi/dvm/led.h
index 8749dcfe695f..6a0817d9c4fa 100644
--- a/drivers/net/wireless/iwlwifi/dvm/led.h
+++ b/drivers/net/wireless/iwlwifi/dvm/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index 3d5bdc4217a8..576f7ee38ca5 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,6 @@
 #include <linux/etherdevice.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/sched.h>
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 9f4239d31c08..40eb5e691475 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -28,7 +28,6 @@
  *****************************************************************************/
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index fd9f6cf96cfd..ba1b1ea54252 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/dvm/power.c b/drivers/net/wireless/iwlwifi/dvm/power.c
index 77cb59712235..b4e61417013a 100644
--- a/drivers/net/wireless/iwlwifi/dvm/power.c
+++ b/drivers/net/wireless/iwlwifi/dvm/power.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -30,7 +30,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <net/mac80211.h>
 #include "iwl-io.h"
 #include "iwl-debug.h"
diff --git a/drivers/net/wireless/iwlwifi/dvm/power.h b/drivers/net/wireless/iwlwifi/dvm/power.h
index 7b03e1342d47..570d3a5e4670 100644
--- a/drivers/net/wireless/iwlwifi/dvm/power.h
+++ b/drivers/net/wireless/iwlwifi/dvm/power.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index b647e506564c..0977d93b529d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -24,7 +24,6 @@
  *
  *****************************************************************************/
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.h b/drivers/net/wireless/iwlwifi/dvm/rs.h
index 41988f4b8a5a..bdd5644a400b 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.h
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c
index d71776dd1e6a..b68bb2f4d2c2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portionhelp of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index d7ce2f12a907..503a81e58185 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 928f8640a0a7..be98b913ed58 100644
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
index c3c13ce96eb0..c0d070c5df5e 100644
--- a/drivers/net/wireless/iwlwifi/dvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.c b/drivers/net/wireless/iwlwifi/dvm/tt.c
index fbeee081ee2f..058c5892c427 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -30,7 +30,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <net/mac80211.h>
 #include "iwl-io.h"
 #include "iwl-modparams.h"
diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.h b/drivers/net/wireless/iwlwifi/dvm/tt.h
index 9356c4b908ca..507726534b84 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tt.h
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index e12b1a63c484..a6839dfcb82d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
 #include "iwl-io.h"
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index 63637949a146..f59709a9b79d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -28,7 +28,6 @@
  *****************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 0d2afe098afc..854ba84ccb73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index c727ec7c90a6..3e63323637f3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index ecc01e1a61a1..6674f2c4541c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 8ac305be68f4..8048de90233f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 5fb37724c096..2a59da2ff87a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index 6d73f943cefa..7f37fb86837b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index e05440ff5cd4..1ced525157dc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index da4eca8b3007..9d325516c42d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -198,7 +198,8 @@
                                  CSR_INT_BIT_RF_KILL | \
                                  CSR_INT_BIT_SW_RX   | \
                                  CSR_INT_BIT_WAKEUP  | \
-                                 CSR_INT_BIT_ALIVE)
+                                 CSR_INT_BIT_ALIVE   | \
+                                 CSR_INT_BIT_RX_PERIODIC)
 
 /* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
 #define CSR_FH_INT_BIT_ERR       (1 << 31) /* Error */
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index b2bb32a781dd..a75aac986a23 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 8f61c717f619..23e7351e02de 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 684c416d3493..78bd41bf34b0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 4bebfb58fc7b..c3728163be46 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index 429337a2b9a1..592c01e11013 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
 /* for all modules */
 #define DRV_NAME        "iwlwifi"
 #define IWLWIFI_VERSION "in-tree:"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2013 Intel Corporation"
+#define DRV_COPYRIGHT   "Copyright(c) 2003- 2014 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index 4380c16580eb..c44cf1149648 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
index d73304a23ec2..e3c7deafabe6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
index e5f2e362ab0b..25d0105741db 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
index 8e941f8bd7d6..a6d3bdf82cdd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 484d318245fb..9564ae173d06 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index 4f95734b2811..88e2d6eb569f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 8704e3042ca1..5f1493c44097 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index ad8e19a56eca..f98175a0d35b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index 63d10ec08dbc..c339c1bed080 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
index a1f580c0c6c6..0a84ade7edac 100644
--- a/drivers/net/wireless/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 940b8a9d5285..b5bc959b1dfe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
index 2e2f1c8c99f9..95af97a6c2cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index a48decc6c68f..1b61cb529948 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
index 3325059c52d4..0c4399aba8c6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index f50e6c62ebc5..b5be51f3cd3d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
index 1a405ae6a9c5..fa77d63a277a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
index ce983af79644..9ee18d0d2d01 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.h
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index f6412dae2659..d69b0fb0a434 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0c3647858909..8d1b5ed3502a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -622,6 +622,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
 {
         int ret;
 
+        if (unlikely(!(cmd->flags & CMD_SEND_IN_RFKILL) &&
+                     test_bit(STATUS_RFKILL, &trans->status)))
+                return -ERFKILL;
+
         if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status)))
                 return -EIO;
 
@@ -684,9 +688,6 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
 
 static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)
 {
-        if (unlikely(trans->state != IWL_TRANS_FW_ALIVE))
-                IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
-
         trans->ops->txq_disable(trans, queue);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/binding.c b/drivers/net/wireless/iwlwifi/mvm/binding.c
index 57d3eed86efa..a1376539d2dc 100644
--- a/drivers/net/wireless/iwlwifi/mvm/binding.c
+++ b/drivers/net/wireless/iwlwifi/mvm/binding.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index d126245c48de..76cde6ce6551 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -294,9 +294,9 @@ static const __le64 iwl_ci_mask[][3] = {
                 cpu_to_le64(0x0)
         },
         {
-                cpu_to_le64(0xFE00000000ULL),
+                cpu_to_le64(0xFFC0000000ULL),
                 cpu_to_le64(0x0ULL),
-                cpu_to_le64(0x0)
+                cpu_to_le64(0x0ULL)
         },
 };
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/constants.h b/drivers/net/wireless/iwlwifi/mvm/constants.h
index 4b6d670c3509..036857698565 100644
--- a/drivers/net/wireless/iwlwifi/mvm/constants.h
+++ b/drivers/net/wireless/iwlwifi/mvm/constants.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 665f87e788d6..f04d2f4d80cd 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index b8667575bc10..0e29cd83a06a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index e8f62a6a1b57..76cdce9edf55 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,51 +123,31 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, char __user *user_buf,
 {
         struct iwl_mvm *mvm = file->private_data;
         const struct fw_img *img;
-        int ofs, len, pos = 0;
-        size_t bufsz, ret;
-        char *buf;
+        unsigned int ofs, len;
+        size_t ret;
         u8 *ptr;
 
         if (!mvm->ucode_loaded)
                 return -EINVAL;
 
         /* default is to dump the entire data segment */
+        img = &mvm->fw->img[mvm->cur_ucode];
+        ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;
+        len = img->sec[IWL_UCODE_SECTION_DATA].len;
+
         if (!mvm->dbgfs_sram_offset && !mvm->dbgfs_sram_len) {
-                img = &mvm->fw->img[mvm->cur_ucode];
-                ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;
-                len = img->sec[IWL_UCODE_SECTION_DATA].len;
-        } else {
                 ofs = mvm->dbgfs_sram_offset;
                 len = mvm->dbgfs_sram_len;
         }
 
-        bufsz = len * 4 + 256;
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
         ptr = kzalloc(len, GFP_KERNEL);
-        if (!ptr) {
-                kfree(buf);
+        if (!ptr)
                 return -ENOMEM;
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n", len);
-        pos += scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n", ofs);
 
         iwl_trans_read_mem_bytes(mvm->trans, ofs, ptr, len);
-        for (ofs = 0; ofs < len; ofs += 16) {
-                pos += scnprintf(buf + pos, bufsz - pos, "0x%.4x ", ofs);
-                hex_dump_to_buffer(ptr + ofs, 16, 16, 1, buf + pos,
-                                   bufsz - pos, false);
-                pos += strlen(buf + pos);
-                if (bufsz - pos > 0)
-                        buf[pos++] = '\n';
-        }
 
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        ret = simple_read_from_buffer(user_buf, count, ppos, ptr, len);
 
-        kfree(buf);
         kfree(ptr);
 
         return ret;
@@ -176,11 +156,24 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, char __user *user_buf,
 static ssize_t iwl_dbgfs_sram_write(struct iwl_mvm *mvm, char *buf,
                                     size_t count, loff_t *ppos)
 {
+        const struct fw_img *img;
         u32 offset, len;
+        u32 img_offset, img_len;
+
+        if (!mvm->ucode_loaded)
+                return -EINVAL;
+
+        img = &mvm->fw->img[mvm->cur_ucode];
+        img_offset = img->sec[IWL_UCODE_SECTION_DATA].offset;
+        img_len = img->sec[IWL_UCODE_SECTION_DATA].len;
 
         if (sscanf(buf, "%x,%x", &offset, &len) == 2) {
                 if ((offset & 0x3) || (len & 0x3))
                         return -EINVAL;
+
+                if (offset + len > img_offset + img_len)
+                        return -EINVAL;
+
                 mvm->dbgfs_sram_offset = offset;
                 mvm->dbgfs_sram_len = len;
         } else {
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.h b/drivers/net/wireless/iwlwifi/mvm/debugfs.h
index 85f9f958bfd2..e3a9774af495 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
index af500996bbf1..1b4e54d416b0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
index 4e7dd8cf87dc..8415ff312d0e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
index 39c3148bdfa8..c405cda1025f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
index cb78e5539357..884c08725308 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
index 532312c7b937..85057219cc43 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
index b3ed59237cba..73cbba7424f2 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
index 8c73ba74b6fd..6bbbad453a3b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
index 22864671d66c..b674c2a2b51c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index 1c3079714c2b..989d7dbdca6c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 27ba104a3540..c03d39541f9e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/led.c b/drivers/net/wireless/iwlwifi/mvm/led.c
index 2269a9e5cc67..6b4ea6bf8ffe 100644
--- a/drivers/net/wireless/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/iwlwifi/mvm/led.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103,7 +103,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)
                 return 0;
         default:
                 return -EINVAL;
-        };
+        }
 
         mvm->led.name = kasprintf(GFP_KERNEL, "%s-led",
                                    wiphy_name(mvm->hw->wiphy));
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index fb93961da750..ba723d50939a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,10 +69,10 @@
 #include "mvm.h"
 
 const u8 iwl_mvm_ac_to_tx_fifo[] = {
-        IWL_MVM_TX_FIFO_BK,
-        IWL_MVM_TX_FIFO_BE,
-        IWL_MVM_TX_FIFO_VI,
         IWL_MVM_TX_FIFO_VO,
+        IWL_MVM_TX_FIFO_VI,
+        IWL_MVM_TX_FIFO_BE,
+        IWL_MVM_TX_FIFO_BK,
 };
 
 struct iwl_mvm_mac_iface_iterator_data {
@@ -85,35 +85,15 @@ struct iwl_mvm_mac_iface_iterator_data {
         bool found_vif;
 };
 
-static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
-                                       struct ieee80211_vif *vif)
+static void iwl_mvm_mac_tsf_id_iter(void *_data, u8 *mac,
+                                    struct ieee80211_vif *vif)
 {
         struct iwl_mvm_mac_iface_iterator_data *data = _data;
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-        u32 ac;
 
-        /* Iterator may already find the interface being added -- skip it */
-        if (vif == data->vif) {
-                data->found_vif = true;
+        /* Skip the interface for which we are trying to assign a tsf_id  */
+        if (vif == data->vif)
                 return;
-        }
-
-        /* Mark the queues used by the vif */
-        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-                if (vif->hw_queue[ac] != IEEE80211_INVAL_HW_QUEUE)
-                        __set_bit(vif->hw_queue[ac], data->used_hw_queues);
-
-        if (vif->cab_queue != IEEE80211_INVAL_HW_QUEUE)
-                __set_bit(vif->cab_queue, data->used_hw_queues);
-
-        /*
-         * Mark MAC IDs as used by clearing the available bit, and
-         * (below) mark TSFs as used if their existing use is not
-         * compatible with the new interface type.
-         * No locking or atomic bit operations are needed since the
-         * data is on the stack of the caller function.
-         */
-        __clear_bit(mvmvif->id, data->available_mac_ids);
 
         /*
          * The TSF is a hardware/firmware resource, there are 4 and
@@ -135,21 +115,26 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
         case NL80211_IFTYPE_STATION:
                 /*
                  * The new interface is client, so if the existing one
-                 * we're iterating is an AP, the TSF should be used to
+                 * we're iterating is an AP, and both interfaces have the
+                 * same beacon interval, the same TSF should be used to
                  * avoid drift between the new client and existing AP,
                  * the existing AP will get drift updates from the new
                  * client context in this case
                  */
                 if (vif->type == NL80211_IFTYPE_AP) {
                         if (data->preferred_tsf == NUM_TSF_IDS &&
-                            test_bit(mvmvif->tsf_id, data->available_tsf_ids))
+                            test_bit(mvmvif->tsf_id, data->available_tsf_ids) &&
+                            (vif->bss_conf.beacon_int ==
+                             data->vif->bss_conf.beacon_int)) {
                                 data->preferred_tsf = mvmvif->tsf_id;
-                        return;
+                                return;
+                        }
                 }
                 break;
         case NL80211_IFTYPE_AP:
                 /*
-                 * The new interface is AP/GO, so should get drift
+                 * The new interface is AP/GO, so in case both interfaces
+                 * have the same beacon interval, it should get drift
                  * updates from an existing client or use the same
                  * TSF as an existing GO. There's no drift between
                  * TSFs internally but if they used different TSFs
@@ -159,9 +144,12 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
                 if (vif->type == NL80211_IFTYPE_STATION ||
                     vif->type == NL80211_IFTYPE_AP) {
                         if (data->preferred_tsf == NUM_TSF_IDS &&
-                            test_bit(mvmvif->tsf_id, data->available_tsf_ids))
+                            test_bit(mvmvif->tsf_id, data->available_tsf_ids) &&
+                            (vif->bss_conf.beacon_int ==
+                             data->vif->bss_conf.beacon_int)) {
                                 data->preferred_tsf = mvmvif->tsf_id;
-                        return;
+                                return;
+                        }
                 }
                 break;
         default:
@@ -187,6 +175,39 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
                 data->preferred_tsf = NUM_TSF_IDS;
 }
 
+static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
+                                       struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_mac_iface_iterator_data *data = _data;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        u32 ac;
+
+        /* Iterator may already find the interface being added -- skip it */
+        if (vif == data->vif) {
+                data->found_vif = true;
+                return;
+        }
+
+        /* Mark the queues used by the vif */
+        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+                if (vif->hw_queue[ac] != IEEE80211_INVAL_HW_QUEUE)
+                        __set_bit(vif->hw_queue[ac], data->used_hw_queues);
+
+        if (vif->cab_queue != IEEE80211_INVAL_HW_QUEUE)
+                __set_bit(vif->cab_queue, data->used_hw_queues);
+
+        /* Mark MAC IDs as used by clearing the available bit, and
+         * (below) mark TSFs as used if their existing use is not
+         * compatible with the new interface type.
+         * No locking or atomic bit operations are needed since the
+         * data is on the stack of the caller function.
+         */
+        __clear_bit(mvmvif->id, data->available_mac_ids);
+
+        /* find a suitable tsf_id */
+        iwl_mvm_mac_tsf_id_iter(_data, mac, vif);
+}
+
 /*
  * Get the mask of the queus used by the vif
  */
@@ -205,6 +226,29 @@ u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm,
         return qmask;
 }
 
+void iwl_mvm_mac_ctxt_recalc_tsf_id(struct iwl_mvm *mvm,
+                                    struct ieee80211_vif *vif)
+{
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        struct iwl_mvm_mac_iface_iterator_data data = {
+                .mvm = mvm,
+                .vif = vif,
+                .available_tsf_ids = { (1 << NUM_TSF_IDS) - 1 },
+                /* no preference yet */
+                .preferred_tsf = NUM_TSF_IDS,
+        };
+
+        ieee80211_iterate_active_interfaces_atomic(
+                mvm->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                iwl_mvm_mac_tsf_id_iter, &data);
+
+        if (data.preferred_tsf != NUM_TSF_IDS)
+                mvmvif->tsf_id = data.preferred_tsf;
+        else if (!test_bit(mvmvif->tsf_id, data.available_tsf_ids))
+                mvmvif->tsf_id = find_first_bit(data.available_tsf_ids,
+                                                NUM_TSF_IDS);
+}
+
 static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm,
                                                struct ieee80211_vif *vif)
 {
@@ -586,18 +630,23 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
                 cpu_to_le32(vif->bss_conf.use_short_slot ?
                             MAC_FLG_SHORT_SLOT : 0);
 
-        for (i = 0; i < AC_NUM; i++) {
-                cmd->ac[i].cw_min = cpu_to_le16(mvmvif->queue_params[i].cw_min);
-                cmd->ac[i].cw_max = cpu_to_le16(mvmvif->queue_params[i].cw_max);
-                cmd->ac[i].aifsn = mvmvif->queue_params[i].aifs;
-                cmd->ac[i].edca_txop =
+        for (i = 0; i < IEEE80211_NUM_ACS; i++) {
+                u8 txf = iwl_mvm_ac_to_tx_fifo[i];
+
+                cmd->ac[txf].cw_min =
+                        cpu_to_le16(mvmvif->queue_params[i].cw_min);
+                cmd->ac[txf].cw_max =
+                        cpu_to_le16(mvmvif->queue_params[i].cw_max);
+                cmd->ac[txf].edca_txop =
                         cpu_to_le16(mvmvif->queue_params[i].txop * 32);
-                cmd->ac[i].fifos_mask = BIT(iwl_mvm_ac_to_tx_fifo[i]);
+                cmd->ac[txf].aifsn = mvmvif->queue_params[i].aifs;
+                cmd->ac[txf].fifos_mask = BIT(txf);
         }
 
         /* in AP mode, the MCAST FIFO takes the EDCA params from VO */
         if (vif->type == NL80211_IFTYPE_AP)
-                cmd->ac[AC_VO].fifos_mask |= BIT(IWL_MVM_TX_FIFO_MCAST);
+                cmd->ac[IWL_MVM_TX_FIFO_VO].fifos_mask |=
+                        BIT(IWL_MVM_TX_FIFO_MCAST);
 
         if (vif->bss_conf.qos)
                 cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);
@@ -1007,7 +1056,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,
                         iwl_mvm_mac_ap_iterator, &data);
 
                 if (data.beacon_device_ts) {
-                        u32 rand = (prandom_u32() % (80 - 20)) + 20;
+                        u32 rand = (prandom_u32() % (64 - 36)) + 36;
                         mvmvif->ap_beacon_time = data.beacon_device_ts +
                                 ieee80211_tu_to_usec(data.beacon_int * rand /
                                                      100);
@@ -1186,10 +1235,18 @@ int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
 static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac,
                                          struct ieee80211_vif *vif)
 {
-        u16 *id = _data;
+        struct iwl_missed_beacons_notif *missed_beacons = _data;
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
-        if (mvmvif->id == *id)
+        if (mvmvif->id != (u16)le32_to_cpu(missed_beacons->mac_id))
+                return;
+
+        /*
+         * TODO: the threshold should be adjusted based on latency conditions,
+         * and/or in case of a CS flow on one of the other AP vifs.
+         */
+        if (le32_to_cpu(missed_beacons->consec_missed_beacons_since_last_rx) >
+             IWL_MVM_MISSED_BEACONS_THRESHOLD)
                 ieee80211_beacon_loss(vif);
 }
 
@@ -1198,12 +1255,19 @@ int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
                                     struct iwl_device_cmd *cmd)
 {
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_missed_beacons_notif *missed_beacons = (void *)pkt->data;
-        u16 id = (u16)le32_to_cpu(missed_beacons->mac_id);
+        struct iwl_missed_beacons_notif *mb = (void *)pkt->data;
+
+        IWL_DEBUG_INFO(mvm,
+                       "missed bcn mac_id=%u, consecutive=%u (%u, %u, %u)\n",
+                       le32_to_cpu(mb->mac_id),
+                       le32_to_cpu(mb->consec_missed_beacons),
+                       le32_to_cpu(mb->consec_missed_beacons_since_last_rx),
+                       le32_to_cpu(mb->num_recvd_beacons),
+                       le32_to_cpu(mb->num_expected_beacons));
 
         ieee80211_iterate_active_interfaces_atomic(mvm->hw,
                                                    IEEE80211_IFACE_ITER_NORMAL,
                                                    iwl_mvm_beacon_loss_iterator,
-                                                   &id);
+                                                   mb);
         return 0;
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 2f5269359dce..b41177eb4888 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,7 +262,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
         mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
 
         /* currently FW API supports only one optional cipher scheme */
-        if (mvm->fw->cs && mvm->fw->cs->cipher) {
+        if (mvm->fw->cs->cipher) {
                 mvm->hw->n_cipher_schemes = 1;
                 mvm->hw->cipher_schemes = mvm->fw->cs;
         }
@@ -866,6 +866,14 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         int ret;
 
+        /*
+         * Re-calculate the tsf id, as the master-slave relations depend on the
+         * beacon interval, which was not known when the station interface was
+         * added.
+         */
+        if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc)
+                iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);
+
         ret = iwl_mvm_mac_ctxt_changed(mvm, vif);
         if (ret)
                 IWL_ERR(mvm, "failed to update MAC %pM\n", vif->addr);
@@ -979,6 +987,13 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,
         if (ret)
                 goto out_unlock;
 
+        /*
+         * Re-calculate the tsf id, as the master-slave relations depend on the
+         * beacon interval, which was not known when the AP interface was added.
+         */
+        if (vif->type == NL80211_IFTYPE_AP)
+                iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);
+
         /* Add the mac context */
         ret = iwl_mvm_mac_ctxt_add(mvm, vif);
         if (ret)
@@ -1671,7 +1686,8 @@ static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
         if (WARN_ONCE((phy_ctxt->ref > 1) &&
                       (changed & ~(IEEE80211_CHANCTX_CHANGE_WIDTH |
                                    IEEE80211_CHANCTX_CHANGE_RX_CHAINS |
-                                   IEEE80211_CHANCTX_CHANGE_RADAR)),
+                                   IEEE80211_CHANCTX_CHANGE_RADAR |
+                                   IEEE80211_CHANCTX_CHANGE_MIN_WIDTH)),
                       "Cannot change PHY. Ref=%d, changed=0x%X\n",
                       phy_ctxt->ref, changed))
                 return;
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 84edf3649ad2..e4ead86f06d6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@
 #define IWL_MVM_MAX_ADDRESSES           5
 /* RSSI offset for WkP */
 #define IWL_RSSI_OFFSET 50
+#define IWL_MVM_MISSED_BEACONS_THRESHOLD 8
 
 enum iwl_mvm_tx_fifo {
         IWL_MVM_TX_FIFO_BK = 0,
@@ -711,6 +712,8 @@ int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
 int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
                                     struct iwl_rx_cmd_buffer *rxb,
                                     struct iwl_device_cmd *cmd);
+void iwl_mvm_mac_ctxt_recalc_tsf_id(struct iwl_mvm *mvm,
+                                    struct ieee80211_vif *vif);
 
 /* Bindings */
 int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 48089b1625ff..c6beb0f842d5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -367,16 +367,17 @@ static int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
                         break;
                 }
 
+                if (WARN(section_id >= NVM_NUM_OF_SECTIONS,
+                         "Invalid NVM section ID %d\n", section_id)) {
+                        ret = -EINVAL;
+                        break;
+                }
+
                 temp = kmemdup(file_sec->data, section_size, GFP_KERNEL);
                 if (!temp) {
                         ret = -ENOMEM;
                         break;
                 }
-                if (WARN_ON(section_id >= NVM_NUM_OF_SECTIONS)) {
-                        IWL_ERR(mvm, "Invalid NVM section ID\n");
-                        ret = -EINVAL;
-                        break;
-                }
                 mvm->nvm_sections[section_id].data = temp;
                 mvm->nvm_sections[section_id].length = section_size;
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index a362430477a0..552c76a926ed 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -665,6 +665,8 @@ static void iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
         else
                 clear_bit(IWL_MVM_STATUS_HW_RFKILL, &mvm->status);
 
+        if (state && mvm->cur_ucode != IWL_UCODE_INIT)
+                iwl_trans_stop_device(mvm->trans);
         wiphy_rfkill_set_hw_state(mvm->hw->wiphy, iwl_mvm_is_radio_killed(mvm));
 }
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index a8652ddd6bed..b7268c0b3333 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 483ecc67501f..d9eab3b7bb9f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/power_legacy.c b/drivers/net/wireless/iwlwifi/mvm/power_legacy.c
index 2ce79bad5845..ef712ae5bc62 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power_legacy.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power_legacy.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c
index 38165eba2a17..ce5db6c4ef7e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/quota.c
+++ b/drivers/net/wireless/iwlwifi/mvm/quota.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index d6d28d7b442b..ba078a3322b8 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -24,7 +24,6 @@
  *
  *****************************************************************************/
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
@@ -700,7 +699,7 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
         u8 num_of_ant = get_num_of_ant_from_rate(ucode_rate);
         u8 nss;
 
-        memset(rate, 0, sizeof(struct rs_rate));
+        memset(rate, 0, sizeof(*rate));
         rate->index = iwl_hwrate_to_plcp_idx(ucode_rate);
 
         if (rate->index == IWL_RATE_INVALID) {
@@ -2121,7 +2120,7 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,
                 tbl->column = RS_COLUMN_LEGACY_ANT_B;
 
         rs_set_expected_tpt_table(lq_sta, tbl);
-        rs_fill_lq_cmd(NULL, NULL, lq_sta, rate);
+        rs_fill_lq_cmd(mvm, sta, lq_sta, rate);
         /* TODO restore station should remember the lq cmd */
         iwl_mvm_send_lq_cmd(mvm, &lq_sta->lq, init);
 }
@@ -2446,10 +2445,9 @@ static void rs_build_rates_table(struct iwl_mvm *mvm,
         struct iwl_lq_cmd *lq_cmd = &lq_sta->lq;
         bool toggle_ant = false;
 
-        memcpy(&rate, initial_rate, sizeof(struct rs_rate));
+        memcpy(&rate, initial_rate, sizeof(rate));
 
-        if (mvm)
-                valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
+        valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
 
         if (is_siso(&rate)) {
                 num_rates = RS_INITIAL_SISO_NUM_RATES;
@@ -2623,7 +2621,7 @@ static void rs_program_fix_rate(struct iwl_mvm *mvm,
                 struct rs_rate rate;
                 rs_rate_from_ucode_rate(lq_sta->dbg_fixed_rate,
                                         lq_sta->band, &rate);
-                rs_fill_lq_cmd(NULL, NULL, lq_sta, &rate);
+                rs_fill_lq_cmd(mvm, NULL, lq_sta, &rate);
                 iwl_mvm_send_lq_cmd(lq_sta->drv, &lq_sta->lq, false);
         }
 }
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.h b/drivers/net/wireless/iwlwifi/mvm/rs.h
index c31aa59728ea..7bc6404f6986 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.h
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index 454341cc3b27..a85b60f7e67e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 4ce9bb581144..0e0007960612 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -473,13 +473,18 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
         if (mvm->scan_status == IWL_MVM_SCAN_NONE)
                 return;
 
+        if (iwl_mvm_is_radio_killed(mvm)) {
+                ieee80211_scan_completed(mvm->hw, true);
+                mvm->scan_status = IWL_MVM_SCAN_NONE;
+                return;
+        }
+
         iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,
                                    scan_abort_notif,
                                    ARRAY_SIZE(scan_abort_notif),
                                    iwl_mvm_scan_abort_notif, NULL);
 
-        ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD,
-                                   CMD_SYNC | CMD_SEND_IN_RFKILL, 0, NULL);
+        ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL);
         if (ret) {
                 IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);
                 /* mac80211's state will be cleaned in the fw_restart flow */
diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c
index 97bb3c3e75ce..8401627c0030 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sf.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 0a8af2083ddc..ec1812133235 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h
index b34941148a98..4968d0237dc5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/testmode.h b/drivers/net/wireless/iwlwifi/mvm/testmode.h
index eb74391d91ca..0241665925f7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/testmode.h
+++ b/drivers/net/wireless/iwlwifi/mvm/testmode.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index 95ce4b601fef..50f3d7f560bc 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.h b/drivers/net/wireless/iwlwifi/mvm/time-event.h
index d9c8d6cfa2db..4a61c8c02372 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.h
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/iwlwifi/mvm/tt.c
index a0ec7b3473bd..3afa6b6bf835 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tt.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 735f86da7985..3c575a39987b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index f4aff56a36da..487d61b25359 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 2e97a3995333..e58b8af56c04 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index 674c75b0d002..e851f26fd44c 100644
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -262,6 +262,7 @@ iwl_pcie_get_scratchbuf_dma(struct iwl_txq *txq, int idx)
  * @rx_page_order: page order for receive buffer size
  * @wd_timeout: queue watchdog timeout (jiffies)
  * @reg_lock: protect hw register access
+ * @cmd_in_flight: true when we have a host command in flight
  */
 struct iwl_trans_pcie {
         struct iwl_rxq rxq;
@@ -273,7 +274,6 @@ struct iwl_trans_pcie {
         __le32 *ict_tbl;
         dma_addr_t ict_tbl_dma;
         int ict_index;
-        u32 inta;
         bool use_ict;
         struct isr_statistics isr_stats;
 
@@ -311,6 +311,7 @@ struct iwl_trans_pcie {
 
         /*protect hw register */
         spinlock_t reg_lock;
+        bool cmd_in_flight;
 };
 
 #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \
@@ -343,7 +344,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans);
 /*****************************************************
 * ICT - interrupt handling
 ******************************************************/
-irqreturn_t iwl_pcie_isr_ict(int irq, void *data);
+irqreturn_t iwl_pcie_isr(int irq, void *data);
 int iwl_pcie_alloc_ict(struct iwl_trans *trans);
 void iwl_pcie_free_ict(struct iwl_trans *trans);
 void iwl_pcie_reset_ict(struct iwl_trans *trans);
@@ -397,13 +398,17 @@ static inline void iwl_enable_interrupts(struct iwl_trans *trans)
 
         IWL_DEBUG_ISR(trans, "Enabling interrupts\n");
         set_bit(STATUS_INT_ENABLED, &trans->status);
+        trans_pcie->inta_mask = CSR_INI_SET_MASK;
         iwl_write32(trans, CSR_INT_MASK, trans_pcie->inta_mask);
 }
 
 static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
         IWL_DEBUG_ISR(trans, "Enabling rfkill interrupt\n");
-        iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
+        trans_pcie->inta_mask = CSR_INT_BIT_RF_KILL;
+        iwl_write32(trans, CSR_INT_MASK, trans_pcie->inta_mask);
 }
 
 static inline void iwl_wake_queue(struct iwl_trans *trans,
@@ -456,4 +461,31 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)
                 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
 }
 
+static inline void __iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans,
+                                                  u32 reg, u32 mask, u32 value)
+{
+        u32 v;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        WARN_ON_ONCE(value & ~mask);
+#endif
+
+        v = iwl_read32(trans, reg);
+        v &= ~mask;
+        v |= value;
+        iwl_write32(trans, reg, v);
+}
+
+static inline void __iwl_trans_pcie_clear_bit(struct iwl_trans *trans,
+                                              u32 reg, u32 mask)
+{
+        __iwl_trans_pcie_set_bits_mask(trans, reg, mask, 0);
+}
+
+static inline void __iwl_trans_pcie_set_bit(struct iwl_trans *trans,
+                                            u32 reg, u32 mask)
+{
+        __iwl_trans_pcie_set_bits_mask(trans, reg, mask, mask);
+}
+
 #endif /* __iwl_trans_int_pcie_h__ */
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 7aeec5ccefa5..1890ea29c264 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -148,10 +148,9 @@ int iwl_pcie_rx_stop(struct iwl_trans *trans)
 static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans,
                                     struct iwl_rxq *rxq)
 {
-        unsigned long flags;
         u32 reg;
 
-        spin_lock_irqsave(&rxq->lock, flags);
+        spin_lock(&rxq->lock);
 
         if (rxq->need_update == 0)
                 goto exit_unlock;
@@ -190,7 +189,7 @@ static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans,
         rxq->need_update = 0;
 
  exit_unlock:
-        spin_unlock_irqrestore(&rxq->lock, flags);
+        spin_unlock(&rxq->lock);
 }
 
 /*
@@ -209,7 +208,6 @@ static void iwl_pcie_rxq_restock(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rxq *rxq = &trans_pcie->rxq;
         struct iwl_rx_mem_buffer *rxb;
-        unsigned long flags;
 
         /*
          * If the device isn't enabled - not need to try to add buffers...
@@ -222,7 +220,7 @@ static void iwl_pcie_rxq_restock(struct iwl_trans *trans)
         if (!test_bit(STATUS_DEVICE_ENABLED, &trans->status))
                 return;
 
-        spin_lock_irqsave(&rxq->lock, flags);
+        spin_lock(&rxq->lock);
         while ((iwl_rxq_space(rxq) > 0) && (rxq->free_count)) {
                 /* The overwritten rxb must be a used one */
                 rxb = rxq->queue[rxq->write];
@@ -239,7 +237,7 @@ static void iwl_pcie_rxq_restock(struct iwl_trans *trans)
                 rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
                 rxq->free_count--;
         }
-        spin_unlock_irqrestore(&rxq->lock, flags);
+        spin_unlock(&rxq->lock);
         /* If the pre-allocated buffer pool is dropping low, schedule to
          * refill it */
         if (rxq->free_count <= RX_LOW_WATERMARK)
@@ -248,9 +246,9 @@ static void iwl_pcie_rxq_restock(struct iwl_trans *trans)
         /* If we've added more space for the firmware to place data, tell it.
          * Increment device's write pointer in multiples of 8. */
         if (rxq->write_actual != (rxq->write & ~0x7)) {
-                spin_lock_irqsave(&rxq->lock, flags);
+                spin_lock(&rxq->lock);
                 rxq->need_update = 1;
-                spin_unlock_irqrestore(&rxq->lock, flags);
+                spin_unlock(&rxq->lock);
                 iwl_pcie_rxq_inc_wr_ptr(trans, rxq);
         }
 }
@@ -270,16 +268,15 @@ static void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority)
         struct iwl_rxq *rxq = &trans_pcie->rxq;
         struct iwl_rx_mem_buffer *rxb;
         struct page *page;
-        unsigned long flags;
         gfp_t gfp_mask = priority;
 
         while (1) {
-                spin_lock_irqsave(&rxq->lock, flags);
+                spin_lock(&rxq->lock);
                 if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        spin_unlock(&rxq->lock);
                         return;
                 }
-                spin_unlock_irqrestore(&rxq->lock, flags);
+                spin_unlock(&rxq->lock);
 
                 if (rxq->free_count > RX_LOW_WATERMARK)
                         gfp_mask |= __GFP_NOWARN;
@@ -308,17 +305,17 @@ static void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority)
                         return;
                 }
 
-                spin_lock_irqsave(&rxq->lock, flags);
+                spin_lock(&rxq->lock);
 
                 if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        spin_unlock(&rxq->lock);
                         __free_pages(page, trans_pcie->rx_page_order);
                         return;
                 }
                 rxb = list_first_entry(&rxq->rx_used, struct iwl_rx_mem_buffer,
                                        list);
                 list_del(&rxb->list);
-                spin_unlock_irqrestore(&rxq->lock, flags);
+                spin_unlock(&rxq->lock);
 
                 BUG_ON(rxb->page);
                 rxb->page = page;
@@ -329,9 +326,9 @@ static void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority)
                                      DMA_FROM_DEVICE);
                 if (dma_mapping_error(trans->dev, rxb->page_dma)) {
                         rxb->page = NULL;
-                        spin_lock_irqsave(&rxq->lock, flags);
+                        spin_lock(&rxq->lock);
                         list_add(&rxb->list, &rxq->rx_used);
-                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        spin_unlock(&rxq->lock);
                         __free_pages(page, trans_pcie->rx_page_order);
                         return;
                 }
@@ -340,12 +337,12 @@ static void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority)
                 /* and also 256 byte aligned! */
                 BUG_ON(rxb->page_dma & DMA_BIT_MASK(8));
 
-                spin_lock_irqsave(&rxq->lock, flags);
+                spin_lock(&rxq->lock);
 
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
 
-                spin_unlock_irqrestore(&rxq->lock, flags);
+                spin_unlock(&rxq->lock);
         }
 }
 
@@ -379,13 +376,12 @@ static void iwl_pcie_rxq_free_rbs(struct iwl_trans *trans)
 static void iwl_pcie_rx_replenish(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
 
         iwl_pcie_rxq_alloc_rbs(trans, GFP_KERNEL);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_pcie_rxq_restock(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 }
 
 static void iwl_pcie_rx_replenish_now(struct iwl_trans *trans)
@@ -511,7 +507,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;
 
         if (!rxq->bd) {
                 err = iwl_pcie_rx_alloc(trans);
@@ -519,7 +514,7 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
                         return err;
         }
 
-        spin_lock_irqsave(&rxq->lock, flags);
+        spin_lock(&rxq->lock);
 
         INIT_WORK(&trans_pcie->rx_replenish, iwl_pcie_rx_replenish_work);
 
@@ -535,16 +530,16 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
         rxq->read = rxq->write = 0;
         rxq->write_actual = 0;
         memset(rxq->rb_stts, 0, sizeof(*rxq->rb_stts));
-        spin_unlock_irqrestore(&rxq->lock, flags);
+        spin_unlock(&rxq->lock);
 
         iwl_pcie_rx_replenish(trans);
 
         iwl_pcie_rx_hw_init(trans, rxq);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         rxq->need_update = 1;
         iwl_pcie_rxq_inc_wr_ptr(trans, rxq);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         return 0;
 }
@@ -553,7 +548,6 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rxq *rxq = &trans_pcie->rxq;
-        unsigned long flags;
 
         /*if rxq->bd is NULL, it means that nothing has been allocated,
          * exit now */
@@ -564,9 +558,9 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
 
         cancel_work_sync(&trans_pcie->rx_replenish);
 
-        spin_lock_irqsave(&rxq->lock, flags);
+        spin_lock(&rxq->lock);
         iwl_pcie_rxq_free_rbs(trans);
-        spin_unlock_irqrestore(&rxq->lock, flags);
+        spin_unlock(&rxq->lock);
 
         dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE,
                           rxq->bd, rxq->bd_dma);
@@ -589,7 +583,6 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rxq *rxq = &trans_pcie->rxq;
         struct iwl_txq *txq = &trans_pcie->txq[trans_pcie->cmd_queue];
-        unsigned long flags;
         bool page_stolen = false;
         int max_len = PAGE_SIZE << trans_pcie->rx_page_order;
         u32 offset = 0;
@@ -691,7 +684,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
         /* Reuse the page if possible. For notification packets and
          * SKBs that fail to Rx correctly, add them back into the
          * rx_free list for reuse later. */
-        spin_lock_irqsave(&rxq->lock, flags);
+        spin_lock(&rxq->lock);
         if (rxb->page != NULL) {
                 rxb->page_dma =
                         dma_map_page(trans->dev, rxb->page, 0,
@@ -712,7 +705,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
                 }
         } else
                 list_add_tail(&rxb->list, &rxq->rx_used);
-        spin_unlock_irqrestore(&rxq->lock, flags);
+        spin_unlock(&rxq->lock);
 }
 
 /*
@@ -807,6 +800,87 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)
         wake_up(&trans_pcie->wait_command_queue);
 }
 
+static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        u32 inta;
+
+        lockdep_assert_held(&trans_pcie->irq_lock);
+
+        trace_iwlwifi_dev_irq(trans->dev);
+
+        /* Discover which interrupts are active/pending */
+        inta = iwl_read32(trans, CSR_INT);
+
+        /* the thread will service interrupts and re-enable them */
+        return inta;
+}
+
+/* a device (PCI-E) page is 4096 bytes long */
+#define ICT_SHIFT       12
+#define ICT_SIZE        (1 << ICT_SHIFT)
+#define ICT_COUNT       (ICT_SIZE / sizeof(u32))
+
+/* interrupt handler using ict table, with this interrupt driver will
+ * stop using INTA register to get device's interrupt, reading this register
+ * is expensive, device will write interrupts in ICT dram table, increment
+ * index then will fire interrupt to driver, driver will OR all ICT table
+ * entries from current index up to table entry with 0 value. the result is
+ * the interrupt we need to service, driver will set the entries back to 0 and
+ * set index.
+ */
+static u32 iwl_pcie_int_cause_ict(struct iwl_trans *trans)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        u32 inta;
+        u32 val = 0;
+        u32 read;
+
+        trace_iwlwifi_dev_irq(trans->dev);
+
+        /* Ignore interrupt if there's nothing in NIC to service.
+         * This may be due to IRQ shared with another device,
+         * or due to sporadic interrupts thrown from our NIC. */
+        read = le32_to_cpu(trans_pcie->ict_tbl[trans_pcie->ict_index]);
+        trace_iwlwifi_dev_ict_read(trans->dev, trans_pcie->ict_index, read);
+        if (!read)
+                return 0;
+
+        /*
+         * Collect all entries up to the first 0, starting from ict_index;
+         * note we already read at ict_index.
+         */
+        do {
+                val |= read;
+                IWL_DEBUG_ISR(trans, "ICT index %d value 0x%08X\n",
+                                trans_pcie->ict_index, read);
+                trans_pcie->ict_tbl[trans_pcie->ict_index] = 0;
+                trans_pcie->ict_index =
+                        iwl_queue_inc_wrap(trans_pcie->ict_index, ICT_COUNT);
+
+                read = le32_to_cpu(trans_pcie->ict_tbl[trans_pcie->ict_index]);
+                trace_iwlwifi_dev_ict_read(trans->dev, trans_pcie->ict_index,
+                                           read);
+        } while (read);
+
+        /* We should not get this value, just ignore it. */
+        if (val == 0xffffffff)
+                val = 0;
+
+        /*
+         * this is a w/a for a h/w bug. the h/w bug may cause the Rx bit
+         * (bit 15 before shifting it to 31) to clear when using interrupt
+         * coalescing. fortunately, bits 18 and 19 stay set when this happens
+         * so we use them to decide on the real state of the Rx bit.
+         * In order words, bit 15 is set if bit 18 or bit 19 are set.
+         */
+        if (val & 0xC0000)
+                val |= 0x8000;
+
+        inta = (0xff & val) | ((0xff00 & val) << 16);
+        return inta;
+}
+
 irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
 {
         struct iwl_trans *trans = dev_id;
@@ -814,12 +888,61 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
         struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
         u32 inta = 0;
         u32 handled = 0;
-        unsigned long flags;
         u32 i;
 
         lock_map_acquire(&trans->sync_cmd_lockdep_map);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
+
+        /* dram interrupt table not set yet,
+         * use legacy interrupt.
+         */
+        if (likely(trans_pcie->use_ict))
+                inta = iwl_pcie_int_cause_ict(trans);
+        else
+                inta = iwl_pcie_int_cause_non_ict(trans);
+
+        if (iwl_have_debug_level(IWL_DL_ISR)) {
+                IWL_DEBUG_ISR(trans,
+                              "ISR inta 0x%08x, enabled 0x%08x(sw), enabled(hw) 0x%08x, fh 0x%08x\n",
+                              inta, trans_pcie->inta_mask,
+                              iwl_read32(trans, CSR_INT_MASK),
+                              iwl_read32(trans, CSR_FH_INT_STATUS));
+                if (inta & (~trans_pcie->inta_mask))
+                        IWL_DEBUG_ISR(trans,
+                                      "We got a masked interrupt (0x%08x)\n",
+                                      inta & (~trans_pcie->inta_mask));
+        }
+
+        inta &= trans_pcie->inta_mask;
+
+        /*
+         * Ignore interrupt if there's nothing in NIC to service.
+         * This may be due to IRQ shared with another device,
+         * or due to sporadic interrupts thrown from our NIC.
+         */
+        if (unlikely(!inta)) {
+                IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n");
+                /*
+                 * Re-enable interrupts here since we don't
+                 * have anything to service
+                 */
+                if (test_bit(STATUS_INT_ENABLED, &trans->status))
+                        iwl_enable_interrupts(trans);
+                spin_unlock(&trans_pcie->irq_lock);
+                lock_map_release(&trans->sync_cmd_lockdep_map);
+                return IRQ_NONE;
+        }
+
+        if (unlikely(inta == 0xFFFFFFFF || (inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
+                /*
+                 * Hardware disappeared. It might have
+                 * already raised an interrupt.
+                 */
+                IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
+                spin_unlock(&trans_pcie->irq_lock);
+                goto out;
+        }
 
         /* Ack/clear/reset pending uCode interrupts.
          * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
@@ -832,19 +955,13 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
          * hardware bugs here by ACKing all the possible interrupts so that
          * interrupt coalescing can still be achieved.
          */
-        iwl_write32(trans, CSR_INT,
-                    trans_pcie->inta | ~trans_pcie->inta_mask);
-
-        inta = trans_pcie->inta;
+        iwl_write32(trans, CSR_INT, inta | ~trans_pcie->inta_mask);
 
         if (iwl_have_debug_level(IWL_DL_ISR))
                 IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n",
                               inta, iwl_read32(trans, CSR_INT_MASK));
 
-        /* saved interrupt in inta variable now we can reset trans_pcie->inta */
-        trans_pcie->inta = 0;
-
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         /* Now service all interrupt bits discovered above. */
         if (inta & CSR_INT_BIT_HW_ERR) {
@@ -1019,11 +1136,6 @@ out:
  *
  ******************************************************************************/
 
-/* a device (PCI-E) page is 4096 bytes long */
-#define ICT_SHIFT       12
-#define ICT_SIZE        (1 << ICT_SHIFT)
-#define ICT_COUNT       (ICT_SIZE / sizeof(u32))
-
 /* Free dram table */
 void iwl_pcie_free_ict(struct iwl_trans *trans)
 {
@@ -1048,7 +1160,7 @@ int iwl_pcie_alloc_ict(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         trans_pcie->ict_tbl =
-                dma_alloc_coherent(trans->dev, ICT_SIZE,
+                dma_zalloc_coherent(trans->dev, ICT_SIZE,
                                    &trans_pcie->ict_tbl_dma,
                                    GFP_KERNEL);
         if (!trans_pcie->ict_tbl)
@@ -1060,17 +1172,10 @@ int iwl_pcie_alloc_ict(struct iwl_trans *trans)
                 return -EINVAL;
         }
 
-        IWL_DEBUG_ISR(trans, "ict dma addr %Lx\n",
-                      (unsigned long long)trans_pcie->ict_tbl_dma);
-
-        IWL_DEBUG_ISR(trans, "ict vir addr %p\n", trans_pcie->ict_tbl);
+        IWL_DEBUG_ISR(trans, "ict dma addr %Lx ict vir addr %p\n",
+                      (unsigned long long)trans_pcie->ict_tbl_dma,
+                      trans_pcie->ict_tbl);
 
-        /* reset table and index to all 0 */
-        memset(trans_pcie->ict_tbl, 0, ICT_SIZE);
-        trans_pcie->ict_index = 0;
-
-        /* add periodic RX interrupt */
-        trans_pcie->inta_mask |= CSR_INT_BIT_RX_PERIODIC;
         return 0;
 }
 
@@ -1081,12 +1186,11 @@ void iwl_pcie_reset_ict(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 val;
-        unsigned long flags;
 
         if (!trans_pcie->ict_tbl)
                 return;
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_disable_interrupts(trans);
 
         memset(trans_pcie->ict_tbl, 0, ICT_SIZE);
@@ -1103,120 +1207,26 @@ void iwl_pcie_reset_ict(struct iwl_trans *trans)
         trans_pcie->ict_index = 0;
         iwl_write32(trans, CSR_INT, trans_pcie->inta_mask);
         iwl_enable_interrupts(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 }
 
 /* Device is going down disable ict interrupt usage */
 void iwl_pcie_disable_ict(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         trans_pcie->use_ict = false;
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-}
-
-/* legacy (non-ICT) ISR. Assumes that trans_pcie->irq_lock is held */
-static irqreturn_t iwl_pcie_isr(int irq, void *data)
-{
-        struct iwl_trans *trans = data;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        u32 inta, inta_mask;
-
-        lockdep_assert_held(&trans_pcie->irq_lock);
-
-        trace_iwlwifi_dev_irq(trans->dev);
-
-        /* Disable (but don't clear!) interrupts here to avoid
-         *    back-to-back ISRs and sporadic interrupts from our NIC.
-         * If we have something to service, the irq thread will re-enable ints.
-         * If we *don't* have something, we'll re-enable before leaving here. */
-        inta_mask = iwl_read32(trans, CSR_INT_MASK);
-        iwl_write32(trans, CSR_INT_MASK, 0x00000000);
-
-        /* Discover which interrupts are active/pending */
-        inta = iwl_read32(trans, CSR_INT);
-
-        if (inta & (~inta_mask)) {
-                IWL_DEBUG_ISR(trans,
-                              "We got a masked interrupt (0x%08x)...Ack and ignore\n",
-                              inta & (~inta_mask));
-                iwl_write32(trans, CSR_INT, inta & (~inta_mask));
-                inta &= inta_mask;
-        }
-
-        /* Ignore interrupt if there's nothing in NIC to service.
-         * This may be due to IRQ shared with another device,
-         * or due to sporadic interrupts thrown from our NIC. */
-        if (!inta) {
-                IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n");
-                /*
-                 * Re-enable interrupts here since we don't have anything to
-                 * service, but only in case the handler won't run. Note that
-                 * the handler can be scheduled because of a previous
-                 * interrupt.
-                 */
-                if (test_bit(STATUS_INT_ENABLED, &trans->status) &&
-                    !trans_pcie->inta)
-                        iwl_enable_interrupts(trans);
-                return IRQ_NONE;
-        }
-
-        if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
-                /* Hardware disappeared. It might have already raised
-                 * an interrupt */
-                IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
-                return IRQ_HANDLED;
-        }
-
-        if (iwl_have_debug_level(IWL_DL_ISR))
-                IWL_DEBUG_ISR(trans,
-                              "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
-                              inta, inta_mask,
-                              iwl_read32(trans, CSR_FH_INT_STATUS));
-
-        trans_pcie->inta |= inta;
-        /* the thread will service interrupts and re-enable them */
-        return IRQ_WAKE_THREAD;
+        spin_unlock(&trans_pcie->irq_lock);
 }
 
-/* interrupt handler using ict table, with this interrupt driver will
- * stop using INTA register to get device's interrupt, reading this register
- * is expensive, device will write interrupts in ICT dram table, increment
- * index then will fire interrupt to driver, driver will OR all ICT table
- * entries from current index up to table entry with 0 value. the result is
- * the interrupt we need to service, driver will set the entries back to 0 and
- * set index.
- */
-irqreturn_t iwl_pcie_isr_ict(int irq, void *data)
+irqreturn_t iwl_pcie_isr(int irq, void *data)
 {
         struct iwl_trans *trans = data;
-        struct iwl_trans_pcie *trans_pcie;
-        u32 inta;
-        u32 val = 0;
-        u32 read;
-        unsigned long flags;
-        irqreturn_t ret = IRQ_NONE;
 
         if (!trans)
                 return IRQ_NONE;
 
-        trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
-        /* dram interrupt table not set yet,
-         * use legacy interrupt.
-         */
-        if (unlikely(!trans_pcie->use_ict)) {
-                ret = iwl_pcie_isr(irq, data);
-                spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-                return ret;
-        }
-
-        trace_iwlwifi_dev_irq(trans->dev);
-
         /* Disable (but don't clear!) interrupts here to avoid
          * back-to-back ISRs and sporadic interrupts from our NIC.
          * If we have something to service, the tasklet will re-enable ints.
@@ -1224,73 +1234,5 @@ irqreturn_t iwl_pcie_isr_ict(int irq, void *data)
          */
         iwl_write32(trans, CSR_INT_MASK, 0x00000000);
 
-        /* Ignore interrupt if there's nothing in NIC to service.
-         * This may be due to IRQ shared with another device,
-         * or due to sporadic interrupts thrown from our NIC. */
-        read = le32_to_cpu(trans_pcie->ict_tbl[trans_pcie->ict_index]);
-        trace_iwlwifi_dev_ict_read(trans->dev, trans_pcie->ict_index, read);
-        if (!read) {
-                IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n");
-                goto none;
-        }
-
-        /*
-         * Collect all entries up to the first 0, starting from ict_index;
-         * note we already read at ict_index.
-         */
-        do {
-                val |= read;
-                IWL_DEBUG_ISR(trans, "ICT index %d value 0x%08X\n",
-                                trans_pcie->ict_index, read);
-                trans_pcie->ict_tbl[trans_pcie->ict_index] = 0;
-                trans_pcie->ict_index =
-                        iwl_queue_inc_wrap(trans_pcie->ict_index, ICT_COUNT);
-
-                read = le32_to_cpu(trans_pcie->ict_tbl[trans_pcie->ict_index]);
-                trace_iwlwifi_dev_ict_read(trans->dev, trans_pcie->ict_index,
-                                           read);
-        } while (read);
-
-        /* We should not get this value, just ignore it. */
-        if (val == 0xffffffff)
-                val = 0;
-
-        /*
-         * this is a w/a for a h/w bug. the h/w bug may cause the Rx bit
-         * (bit 15 before shifting it to 31) to clear when using interrupt
-         * coalescing. fortunately, bits 18 and 19 stay set when this happens
-         * so we use them to decide on the real state of the Rx bit.
-         * In order words, bit 15 is set if bit 18 or bit 19 are set.
-         */
-        if (val & 0xC0000)
-                val |= 0x8000;
-
-        inta = (0xff & val) | ((0xff00 & val) << 16);
-        IWL_DEBUG_ISR(trans, "ISR inta 0x%08x, enabled(sw) 0x%08x ict 0x%08x\n",
-                      inta, trans_pcie->inta_mask, val);
-        if (iwl_have_debug_level(IWL_DL_ISR))
-                IWL_DEBUG_ISR(trans, "enabled(hw) 0x%08x\n",
-                              iwl_read32(trans, CSR_INT_MASK));
-
-        inta &= trans_pcie->inta_mask;
-        trans_pcie->inta |= inta;
-
-        /* iwl_pcie_tasklet() will service interrupts and re-enable them */
-        if (likely(inta)) {
-                spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-                return IRQ_WAKE_THREAD;
-        }
-
-        ret = IRQ_HANDLED;
-
- none:
-        /* re-enable interrupts here since we don't have anything to service.
-         * only Re-enable if disabled by irq.
-         */
-        if (test_bit(STATUS_INT_ENABLED, &trans->status) &&
-            !trans_pcie->inta)
-                iwl_enable_interrupts(trans);
-
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-        return ret;
+        return IRQ_WAKE_THREAD;
 }
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index eecd38e3f15f..16f66c1a23de 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,33 +75,6 @@
 #include "iwl-agn-hw.h"
 #include "internal.h"
 
-static void __iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans,
-                                                  u32 reg, u32 mask, u32 value)
-{
-        u32 v;
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        WARN_ON_ONCE(value & ~mask);
-#endif
-
-        v = iwl_read32(trans, reg);
-        v &= ~mask;
-        v |= value;
-        iwl_write32(trans, reg, v);
-}
-
-static inline void __iwl_trans_pcie_clear_bit(struct iwl_trans *trans,
-                                              u32 reg, u32 mask)
-{
-        __iwl_trans_pcie_set_bits_mask(trans, reg, mask, 0);
-}
-
-static inline void __iwl_trans_pcie_set_bit(struct iwl_trans *trans,
-                                            u32 reg, u32 mask)
-{
-        __iwl_trans_pcie_set_bits_mask(trans, reg, mask, mask);
-}
-
 static void iwl_pcie_set_pwr(struct iwl_trans *trans, bool vaux)
 {
         if (vaux && pci_pme_capable(to_pci_dev(trans->dev), PCI_D3cold))
@@ -271,13 +244,12 @@ static void iwl_pcie_apm_stop(struct iwl_trans *trans)
 static int iwl_pcie_nic_init(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
 
         /* nic_init */
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_pcie_apm_init(trans);
 
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         iwl_pcie_set_pwr(trans, false);
 
@@ -635,13 +607,14 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)
 static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
-        bool hw_rfkill;
+        bool hw_rfkill, was_hw_rfkill;
+
+        was_hw_rfkill = iwl_is_rfkill_set(trans);
 
         /* tell the device to stop sending interrupts */
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_disable_interrupts(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         /* device going down, Stop using ICT table */
         iwl_pcie_disable_ict(trans);
@@ -673,9 +646,9 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
         /* Upon stop, the APM issues an interrupt if HW RF kill is set.
          * Clean again the interrupt here
          */
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_disable_interrupts(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         /* stop and reset the on-board processor */
         iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
@@ -698,13 +671,20 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
          * all the interrupts were disabled, in this case we couldn't
          * receive the RF kill interrupt and update the state in the
          * op_mode.
+         * Don't call the op_mode if the rkfill state hasn't changed.
+         * This allows the op_mode to call stop_device from the rfkill
+         * notification without endless recursion. Under very rare
+         * circumstances, we might have a small recursion if the rfkill
+         * state changed exactly now while we were called from stop_device.
+         * This is very unlikely but can happen and is supported.
          */
         hw_rfkill = iwl_is_rfkill_set(trans);
         if (hw_rfkill)
                 set_bit(STATUS_RFKILL, &trans->status);
         else
                 clear_bit(STATUS_RFKILL, &trans->status);
-        iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
+        if (hw_rfkill != was_hw_rfkill)
+                iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 }
 
 static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test)
@@ -799,7 +779,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
         }
 
         /* Reset the entire device */
-        iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
+        iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
 
         usleep_range(10, 15);
 
@@ -821,18 +801,17 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
 
         /* disable interrupts - don't enable HW RF kill interrupt */
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_disable_interrupts(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         iwl_pcie_apm_stop(trans);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
         iwl_disable_interrupts(trans);
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         iwl_pcie_disable_ict(trans);
 }
@@ -932,6 +911,9 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent,
 
         spin_lock_irqsave(&trans_pcie->reg_lock, *flags);
 
+        if (trans_pcie->cmd_in_flight)
+                goto out;
+
         /* this bit wakes up the NIC */
         __iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
                                  CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
@@ -971,6 +953,7 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent,
                 }
         }
 
+out:
         /*
          * Fool sparse by faking we release the lock - sparse will
          * track nic_access anyway.
@@ -992,6 +975,9 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,
          */
         __acquire(&trans_pcie->reg_lock);
 
+        if (trans_pcie->cmd_in_flight)
+                goto out;
+
         __iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
                                    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
         /*
@@ -1001,6 +987,7 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,
          * scheduled on different CPUs (after we drop reg_lock).
          */
         mmiowb();
+out:
         spin_unlock_irqrestore(&trans_pcie->reg_lock, *flags);
 }
 
@@ -1597,7 +1584,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         if (iwl_pcie_alloc_ict(trans))
                 goto out_free_cmd_pool;
 
-        err = request_threaded_irq(pdev->irq, iwl_pcie_isr_ict,
+        err = request_threaded_irq(pdev->irq, iwl_pcie_isr,
                                    iwl_pcie_irq_handler,
                                    IRQF_SHARED, DRV_NAME, trans);
         if (err) {
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 8df24787c141..3b14fa8abfc7 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -737,10 +737,9 @@ int iwl_pcie_tx_stop(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ch, txq_id, ret;
-        unsigned long flags;
 
         /* Turn off all Tx DMA fifos */
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
 
         iwl_pcie_txq_set_sched(trans, 0);
 
@@ -757,13 +756,19 @@ int iwl_pcie_tx_stop(struct iwl_trans *trans)
                                 iwl_read_direct32(trans,
                                                   FH_TSSR_TX_STATUS_REG));
         }
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
-        if (!trans_pcie->txq) {
-                IWL_WARN(trans,
-                         "Stopping tx queues that aren't allocated...\n");
+        /*
+         * This function can be called before the op_mode disabled the
+         * queues. This happens when we have an rfkill interrupt.
+         * Since we stop Tx altogether - mark the queues as stopped.
+         */
+        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
+        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
+
+        /* This can happen: start_hw, stop_device */
+        if (!trans_pcie->txq)
                 return 0;
-        }
 
         /* Unmap DMA from host system and free skb's */
         for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
@@ -865,7 +870,6 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
         int txq_id, slots_num;
-        unsigned long flags;
         bool alloc = false;
 
         if (!trans_pcie->txq) {
@@ -875,7 +879,7 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
                 alloc = true;
         }
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        spin_lock(&trans_pcie->irq_lock);
 
         /* Turn off all Tx DMA fifos */
         iwl_write_prph(trans, SCD_TXFACT, 0);
@@ -884,7 +888,7 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)
         iwl_write_direct32(trans, FH_KW_MEM_ADDR_REG,
                            trans_pcie->kw.dma >> 4);
 
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        spin_unlock(&trans_pcie->irq_lock);
 
         /* Alloc and init all Tx queues, including the command queue (#4/#9) */
         for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
@@ -1003,6 +1007,7 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_txq *txq = &trans_pcie->txq[txq_id];
         struct iwl_queue *q = &txq->q;
+        unsigned long flags;
         int nfreed = 0;
 
         lockdep_assert_held(&txq->lock);
@@ -1025,6 +1030,16 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)
                 }
         }
 
+        if (q->read_ptr == q->write_ptr) {
+                spin_lock_irqsave(&trans_pcie->reg_lock, flags);
+                WARN_ON(!trans_pcie->cmd_in_flight);
+                trans_pcie->cmd_in_flight = false;
+                __iwl_trans_pcie_clear_bit(trans,
+                                           CSR_GP_CNTRL,
+                                           CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
+        }
+
         iwl_pcie_txq_progress(trans_pcie, txq);
 }
 
@@ -1141,8 +1156,15 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
                         SCD_TX_STTS_QUEUE_OFFSET(txq_id);
         static const u32 zero_val[4] = {};
 
+        /*
+         * Upon HW Rfkill - we stop the device, and then stop the queues
+         * in the op_mode. Just for the sake of the simplicity of the op_mode,
+         * allow the op_mode to call txq_disable after it already called
+         * stop_device.
+         */
         if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {
-                WARN_ONCE(1, "queue %d not used", txq_id);
+                WARN_ONCE(test_bit(STATUS_DEVICE_ENABLED, &trans->status),
+                          "queue %d not used", txq_id);
                 return;
         }
 
@@ -1176,12 +1198,13 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
         struct iwl_queue *q = &txq->q;
         struct iwl_device_cmd *out_cmd;
         struct iwl_cmd_meta *out_meta;
+        unsigned long flags;
         void *dup_buf = NULL;
         dma_addr_t phys_addr;
         int idx;
         u16 copy_size, cmd_size, scratch_size;
         bool had_nocopy = false;
-        int i;
+        int i, ret;
         u32 cmd_pos;
         const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
         u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
@@ -1379,10 +1402,38 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
         if (q->read_ptr == q->write_ptr && trans_pcie->wd_timeout)
                 mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout);
 
+        spin_lock_irqsave(&trans_pcie->reg_lock, flags);
+
+        /*
+         * wake up the NIC to make sure that the firmware will see the host
+         * command - we will let the NIC sleep once all the host commands
+         * returned.
+         */
+        if (!trans_pcie->cmd_in_flight) {
+                trans_pcie->cmd_in_flight = true;
+                __iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
+                                         CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                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_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
+                                   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                        spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
+                        trans_pcie->cmd_in_flight = false;
+                        idx = -EIO;
+                        goto out;
+                }
+        }
+
         /* Increment and update queue's write index */
         q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         iwl_pcie_txq_inc_wr_ptr(trans, txq);
 
+        spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
+
  out:
         spin_unlock_bh(&txq->lock);
  free_dup_buf:
@@ -1464,7 +1515,6 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
 }
 
 #define HOST_COMPLETE_TIMEOUT   (2 * HZ)
-#define COMMAND_POKE_TIMEOUT    (HZ / 10)
 
 static int iwl_pcie_send_hcmd_async(struct iwl_trans *trans,
                                     struct iwl_host_cmd *cmd)
@@ -1492,7 +1542,6 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int cmd_idx;
         int ret;
-        int timeout = HOST_COMPLETE_TIMEOUT;
 
         IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",
                        get_cmd_string(trans_pcie, cmd->id));
@@ -1516,29 +1565,10 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
                 return ret;
         }
 
-        while (timeout > 0) {
-                unsigned long flags;
-
-                timeout -= COMMAND_POKE_TIMEOUT;
-                ret = wait_event_timeout(trans_pcie->wait_command_queue,
-                                         !test_bit(STATUS_SYNC_HCMD_ACTIVE,
-                                                   &trans->status),
-                                         COMMAND_POKE_TIMEOUT);
-                if (ret)
-                        break;
-                /* poke the device - it may have lost the command */
-                if (iwl_trans_grab_nic_access(trans, true, &flags)) {
-                        iwl_trans_release_nic_access(trans, &flags);
-                        IWL_DEBUG_INFO(trans,
-                                       "Tried to wake NIC for command %s\n",
-                                       get_cmd_string(trans_pcie, cmd->id));
-                } else {
-                        IWL_ERR(trans, "Failed to poke NIC for command %s\n",
-                                get_cmd_string(trans_pcie, cmd->id));
-                        break;
-                }
-        }
-
+        ret = wait_event_timeout(trans_pcie->wait_command_queue,
+                                 !test_bit(STATUS_SYNC_HCMD_ACTIVE,
+                                           &trans->status),
+                                 HOST_COMPLETE_TIMEOUT);
         if (!ret) {
                 struct iwl_txq *txq = &trans_pcie->txq[trans_pcie->cmd_queue];
                 struct iwl_queue *q = &txq->q;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index b994679abce0..e7c81abf108e 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -563,14 +563,7 @@ static void mwifiex_reg_notifier(struct wiphy *wiphy,
                 memcpy(adapter->country_code, request->alpha2,
                        sizeof(request->alpha2));
                 mwifiex_send_domain_info_cmd_fw(wiphy);
-
-                if (adapter->dt_node) {
-                        char txpwr[] = {"marvell,00_txpwrlimit"};
-
-                        memcpy(&txpwr[8], adapter->country_code, 2);
-                        mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,
-                                                txpwr);
-                }
+                mwifiex_dnld_txpwr_table(priv);
         }
 }
 
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 6bf58aba51d2..2d6f5e1721cf 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -749,7 +749,7 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev)
 static u16
 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)
 {
-        skb->priority = cfg80211_classify8021d(skb);
+        skb->priority = cfg80211_classify8021d(skb, NULL);
         return mwifiex_1d_to_wmm_queue[skb->priority];
 }
 
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index ab3416449bfd..d8ad554ce39f 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -1155,6 +1155,7 @@ void mwifiex_11h_process_join(struct mwifiex_private *priv, u8 **buffer,
 int mwifiex_11h_handle_event_chanswann(struct mwifiex_private *priv);
 int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv,
                             struct device_node *node, const char *prefix);
+void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv);
 
 extern const struct ethtool_ops mwifiex_ethtool_ops;
 
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 9c2404cd755f..9208a8816b80 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -1170,8 +1170,9 @@ int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv,
                     strncmp(prop->name, prefix, len))
                         continue;
 
-                /* property header is 6 bytes */
-                if (prop && prop->value && prop->length > 6) {
+                /* property header is 6 bytes, data must fit in cmd buffer */
+                if (prop && prop->value && prop->length > 6 &&
+                    prop->length <= MWIFIEX_SIZE_OF_CMD_BUFFER - S_DS_GEN) {
                         ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_CFG_DATA,
                                                     HostCmd_ACT_GEN_SET, 0,
                                                     prop);
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 3edc92fad319..c5cb2ed19ec2 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -184,6 +184,16 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
         return mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);
 }
 
+void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv)
+{
+        if (priv->adapter->dt_node) {
+                char txpwr[] = {"marvell,00_txpwrlimit"};
+
+                memcpy(&txpwr[8], priv->adapter->country_code, 2);
+                mwifiex_dnld_dt_cfgdata(priv, priv->adapter->dt_node, txpwr);
+        }
+}
+
 static int mwifiex_process_country_ie(struct mwifiex_private *priv,
                                       struct cfg80211_bss *bss)
 {
@@ -234,12 +244,7 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
                 return -1;
         }
 
-        if (priv->adapter->dt_node) {
-                char txpwr[] = {"marvell,00_txpwrlimit"};
-
-                memcpy(&txpwr[8], priv->adapter->country_code, 2);
-                mwifiex_dnld_dt_cfgdata(priv, priv->adapter->dt_node, txpwr);
-        }
+        mwifiex_dnld_txpwr_table(priv);
 
         return 0;
 }
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index b953ad621e0b..63dbde5c3713 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -9,7 +9,6 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -1258,7 +1257,7 @@ mwl8k_capture_bssid(struct mwl8k_priv *priv, struct ieee80211_hdr *wh)
 {
         return priv->capture_beacon &&
                 ieee80211_is_beacon(wh->frame_control) &&
-                ether_addr_equal(wh->addr3, priv->capture_bssid);
+                ether_addr_equal_64bits(wh->addr3, priv->capture_bssid);
 }
 
 static inline void mwl8k_save_beacon(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c
index 75c15bc7b34c..43790fbea0e0 100644
--- a/drivers/net/wireless/orinoco/hermes.c
+++ b/drivers/net/wireless/orinoco/hermes.c
@@ -40,7 +40,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 
 #include "hermes.h"
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index d21d95939316..c0a27377d9e2 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -15,7 +15,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index bdfe637953f4..f9805c9353d2 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -52,7 +52,6 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/poll.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/fcntl.h>
 #include <linux/spinlock.h>
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index e2264bc12ebf..b60048c95e0a 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -23,7 +23,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index d43e3740e45d..0fe67d2da208 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/sort.h>
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index b3879fbf5368..bc065e8e348b 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/p54/led.c
index 3837e1eec5f4..1f6fd5ff5531 100644
--- a/drivers/net/wireless/p54/led.c
+++ b/drivers/net/wireless/p54/led.c
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 067e6f2fd050..80d93cba5150 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index f9a07b0d83ac..d411de409050 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -13,7 +13,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index e328d3058c41..6e635cfa24c8 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -12,7 +12,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/usb.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index f95de0d16216..9c96831c0b5c 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/export.h>
-#include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <asm/div64.h>
@@ -308,7 +307,7 @@ static void p54_pspoll_workaround(struct p54_common *priv, struct sk_buff *skb)
                 return;
 
         /* only consider beacons from the associated BSSID */
-        if (!ether_addr_equal(hdr->addr3, priv->bssid))
+        if (!ether_addr_equal_64bits(hdr->addr3, priv->bssid))
                 return;
 
         tim = p54_find_ie(skb, WLAN_EID_TIM);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index c3cdda1252de..5028557aa18a 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -26,7 +26,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 4ad0de9d1d08..4ccfef5094e0 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -24,7 +24,6 @@
 
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 4f61ffbcd2f1..abc5f56f29fe 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -24,7 +24,6 @@
 
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 1bb76935da71..9f16824cd1bc 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -24,7 +24,6 @@
 
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 49ff178a0b46..5c5c4906c6b6 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -29,7 +29,6 @@
 
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/usb.h>
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 00c3fae6fa3c..2bde6729f5e6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -565,10 +565,10 @@ static void rt2x00lib_rxdone_check_ba(struct rt2x00_dev *rt2x00dev,
 
 #undef TID_CHECK
 
-                if (!ether_addr_equal(ba->ra, entry->ta))
+                if (!ether_addr_equal_64bits(ba->ra, entry->ta))
                         continue;
 
-                if (!ether_addr_equal(ba->ta, entry->ra))
+                if (!ether_addr_equal_64bits(ba->ta, entry->ra))
                         continue;
 
                 /* Mark BAR since we received the according BA */
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index b76f6049ad9a..24402984ee57 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -25,7 +25,6 @@
 #include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index ade88d7e089c..a140170b1eb3 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -25,7 +25,6 @@
 #include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index a91506b12a62..8ec17aad0e52 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -15,7 +15,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/grf5101.c b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
index dc845693f321..b1bfee738937 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
@@ -19,7 +19,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/max2820.c b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
index a63c443c3c6f..eebf23976524 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/max2820.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
@@ -18,7 +18,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
index ee638d0749d6..d60a5f399022 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
@@ -15,7 +15,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/sa2400.c b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
index 7614d9ccc729..959b049827de 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
@@ -19,7 +19,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index ec9aa5b67381..fd78df813a85 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -20,7 +20,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
index a26193a04447..5ecf18ed67b8 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/usb.h>
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index fcf9b621918c..d63a12cc5de8 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -1293,7 +1293,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->link_info.bcn_rx_inperiod++;
@@ -1781,7 +1781,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         if (rtl_find_221_ie(hw, data, len))
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 0d81f766fd0f..deedae3c5449 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -478,7 +478,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->psc.last_beacon = jiffies;
@@ -923,7 +923,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         /* check if this really is a beacon */
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index 374268d5ac6a..5a4ec56c83d0 100644
--- a/drivers/net/wireless/ti/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
@@ -194,7 +194,7 @@ out:
         return ret;
 }
 
-int wl1251_acx_feature_cfg(struct wl1251 *wl)
+int wl1251_acx_feature_cfg(struct wl1251 *wl, u32 data_flow_options)
 {
         struct acx_feature_config *feature;
         int ret;
@@ -205,8 +205,8 @@ int wl1251_acx_feature_cfg(struct wl1251 *wl)
         if (!feature)
                 return -ENOMEM;
 
-        /* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */
-        feature->data_flow_options = 0;
+        /* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE can be set */
+        feature->data_flow_options = data_flow_options;
         feature->options = 0;
 
         ret = wl1251_cmd_configure(wl, ACX_FEATURE_CFG,
@@ -381,7 +381,8 @@ out:
         return ret;
 }
 
-int wl1251_acx_group_address_tbl(struct wl1251 *wl)
+int wl1251_acx_group_address_tbl(struct wl1251 *wl, bool enable,
+                                 void *mc_list, u32 mc_list_len)
 {
         struct acx_dot11_grp_addr_tbl *acx;
         int ret;
@@ -393,9 +394,9 @@ int wl1251_acx_group_address_tbl(struct wl1251 *wl)
                 return -ENOMEM;
 
         /* MAC filtering */
-        acx->enabled = 0;
-        acx->num_groups = 0;
-        memset(acx->mac_table, 0, ADDRESS_GROUP_MAX_LEN);
+        acx->enabled = enable;
+        acx->num_groups = mc_list_len;
+        memcpy(acx->mac_table, mc_list, mc_list_len * ETH_ALEN);
 
         ret = wl1251_cmd_configure(wl, DOT11_GROUP_ADDRESS_TBL,
                                    acx, sizeof(*acx));
@@ -846,12 +847,18 @@ int wl1251_acx_rate_policies(struct wl1251 *wl)
                 return -ENOMEM;
 
         /* configure one default (one-size-fits-all) rate class */
-        acx->rate_class_cnt = 1;
+        acx->rate_class_cnt = 2;
         acx->rate_class[0].enabled_rates = ACX_RATE_MASK_UNSPECIFIED;
         acx->rate_class[0].short_retry_limit = ACX_RATE_RETRY_LIMIT;
         acx->rate_class[0].long_retry_limit = ACX_RATE_RETRY_LIMIT;
         acx->rate_class[0].aflags = 0;
 
+        /* no-retry rate class */
+        acx->rate_class[1].enabled_rates = ACX_RATE_MASK_UNSPECIFIED;
+        acx->rate_class[1].short_retry_limit = 0;
+        acx->rate_class[1].long_retry_limit = 0;
+        acx->rate_class[1].aflags = 0;
+
         ret = wl1251_cmd_configure(wl, ACX_RATE_POLICY, acx, sizeof(*acx));
         if (ret < 0) {
                 wl1251_warning("Setting of rate policies failed: %d", ret);
@@ -960,6 +967,32 @@ out:
         return ret;
 }
 
+int wl1251_acx_arp_ip_filter(struct wl1251 *wl, bool enable, __be32 address)
+{
+        struct wl1251_acx_arp_filter *acx;
+        int ret;
+
+        wl1251_debug(DEBUG_ACX, "acx arp ip filter, enable: %d", enable);
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx)
+                return -ENOMEM;
+
+        acx->version = ACX_IPV4_VERSION;
+        acx->enable = enable;
+
+        if (enable)
+                memcpy(acx->address, &address, ACX_IPV4_ADDR_SIZE);
+
+        ret = wl1251_cmd_configure(wl, ACX_ARP_IP_FILTER,
+                                   acx, sizeof(*acx));
+        if (ret < 0)
+                wl1251_warning("failed to set arp ip filter: %d", ret);
+
+        kfree(acx);
+        return ret;
+}
+
 int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,
                       u8 aifs, u16 txop)
 {
diff --git a/drivers/net/wireless/ti/wl1251/acx.h b/drivers/net/wireless/ti/wl1251/acx.h
index c2ba100f9b1a..2bdec38699f4 100644
--- a/drivers/net/wireless/ti/wl1251/acx.h
+++ b/drivers/net/wireless/ti/wl1251/acx.h
@@ -350,8 +350,8 @@ struct acx_slot {
 } __packed;
 
 
-#define ADDRESS_GROUP_MAX       (8)
-#define ADDRESS_GROUP_MAX_LEN   (ETH_ALEN * ADDRESS_GROUP_MAX)
+#define ACX_MC_ADDRESS_GROUP_MAX        (8)
+#define ACX_MC_ADDRESS_GROUP_MAX_LEN    (ETH_ALEN * ACX_MC_ADDRESS_GROUP_MAX)
 
 struct acx_dot11_grp_addr_tbl {
         struct acx_header header;
@@ -359,7 +359,7 @@ struct acx_dot11_grp_addr_tbl {
         u8 enabled;
         u8 num_groups;
         u8 pad[2];
-        u8 mac_table[ADDRESS_GROUP_MAX_LEN];
+        u8 mac_table[ACX_MC_ADDRESS_GROUP_MAX_LEN];
 } __packed;
 
 
@@ -1232,6 +1232,20 @@ struct wl1251_acx_bet_enable {
         u8 padding[2];
 } __packed;
 
+#define ACX_IPV4_VERSION 4
+#define ACX_IPV6_VERSION 6
+#define ACX_IPV4_ADDR_SIZE 4
+struct wl1251_acx_arp_filter {
+        struct acx_header header;
+        u8 version;     /* The IP version: 4 - IPv4, 6 - IPv6.*/
+        u8 enable;      /* 1 - ARP filtering is enabled, 0 - disabled */
+        u8 padding[2];
+        u8 address[16]; /* The IP address used to filter ARP packets.
+                           ARP packets that do not match this address are
+                           dropped. When the IP Version is 4, the last 12
+                           bytes of the the address are ignored. */
+} __attribute__((packed));
+
 struct wl1251_acx_ac_cfg {
         struct acx_header header;
 
@@ -1440,7 +1454,7 @@ int wl1251_acx_wake_up_conditions(struct wl1251 *wl, u8 wake_up_event,
 int wl1251_acx_sleep_auth(struct wl1251 *wl, u8 sleep_auth);
 int wl1251_acx_fw_version(struct wl1251 *wl, char *buf, size_t len);
 int wl1251_acx_tx_power(struct wl1251 *wl, int power);
-int wl1251_acx_feature_cfg(struct wl1251 *wl);
+int wl1251_acx_feature_cfg(struct wl1251 *wl, u32 data_flow_options);
 int wl1251_acx_mem_map(struct wl1251 *wl,
                        struct acx_header *mem_map, size_t len);
 int wl1251_acx_data_path_params(struct wl1251 *wl,
@@ -1449,7 +1463,8 @@ int wl1251_acx_rx_msdu_life_time(struct wl1251 *wl, u32 life_time);
 int wl1251_acx_rx_config(struct wl1251 *wl, u32 config, u32 filter);
 int wl1251_acx_pd_threshold(struct wl1251 *wl);
 int wl1251_acx_slot(struct wl1251 *wl, enum acx_slot_type slot_time);
-int wl1251_acx_group_address_tbl(struct wl1251 *wl);
+int wl1251_acx_group_address_tbl(struct wl1251 *wl, bool enable,
+                                 void *mc_list, u32 mc_list_len);
 int wl1251_acx_service_period_timeout(struct wl1251 *wl);
 int wl1251_acx_rts_threshold(struct wl1251 *wl, u16 rts_threshold);
 int wl1251_acx_beacon_filter_opt(struct wl1251 *wl, bool enable_filter);
@@ -1473,6 +1488,7 @@ int wl1251_acx_mem_cfg(struct wl1251 *wl);
 int wl1251_acx_wr_tbtt_and_dtim(struct wl1251 *wl, u16 tbtt, u8 dtim);
 int wl1251_acx_bet_enable(struct wl1251 *wl, enum wl1251_acx_bet_mode mode,
                           u8 max_consecutive);
+int wl1251_acx_arp_ip_filter(struct wl1251 *wl, bool enable, __be32 address);
 int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,
                       u8 aifs, u16 txop);
 int wl1251_acx_tid_cfg(struct wl1251 *wl, u8 queue,
diff --git a/drivers/net/wireless/ti/wl1251/boot.c b/drivers/net/wireless/ti/wl1251/boot.c
index a2e5241382da..2000cd536077 100644
--- a/drivers/net/wireless/ti/wl1251/boot.c
+++ b/drivers/net/wireless/ti/wl1251/boot.c
@@ -299,7 +299,8 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
                 ROAMING_TRIGGER_LOW_RSSI_EVENT_ID |
                 ROAMING_TRIGGER_REGAINED_RSSI_EVENT_ID |
                 REGAINED_BSS_EVENT_ID | BT_PTA_SENSE_EVENT_ID |
-                BT_PTA_PREDICTION_EVENT_ID | JOIN_EVENT_COMPLETE_ID;
+                BT_PTA_PREDICTION_EVENT_ID | JOIN_EVENT_COMPLETE_ID |
+                PS_REPORT_EVENT_ID;
 
         ret = wl1251_event_unmask(wl);
         if (ret < 0) {
diff --git a/drivers/net/wireless/ti/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c
index 6822b845efc1..223649bcaa5a 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
@@ -3,6 +3,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/crc7.h>
+#include <linux/etherdevice.h>
 
 #include "wl1251.h"
 #include "reg.h"
@@ -203,11 +204,11 @@ out:
         return ret;
 }
 
-int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable)
+int wl1251_cmd_data_path_rx(struct wl1251 *wl, u8 channel, bool enable)
 {
         struct cmd_enabledisable_path *cmd;
         int ret;
-        u16 cmd_rx, cmd_tx;
+        u16 cmd_rx;
 
         wl1251_debug(DEBUG_CMD, "cmd data path");
 
@@ -219,13 +220,10 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable)
 
         cmd->channel = channel;
 
-        if (enable) {
+        if (enable)
                 cmd_rx = CMD_ENABLE_RX;
-                cmd_tx = CMD_ENABLE_TX;
-        } else {
+        else
                 cmd_rx = CMD_DISABLE_RX;
-                cmd_tx = CMD_DISABLE_TX;
-        }
 
         ret = wl1251_cmd_send(wl, cmd_rx, cmd, sizeof(*cmd));
         if (ret < 0) {
@@ -237,17 +235,38 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable)
         wl1251_debug(DEBUG_BOOT, "rx %s cmd channel %d",
                      enable ? "start" : "stop", channel);
 
+out:
+        kfree(cmd);
+        return ret;
+}
+
+int wl1251_cmd_data_path_tx(struct wl1251 *wl, u8 channel, bool enable)
+{
+        struct cmd_enabledisable_path *cmd;
+        int ret;
+        u16 cmd_tx;
+
+        wl1251_debug(DEBUG_CMD, "cmd data path");
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
+
+        cmd->channel = channel;
+
+        if (enable)
+                cmd_tx = CMD_ENABLE_TX;
+        else
+                cmd_tx = CMD_DISABLE_TX;
+
         ret = wl1251_cmd_send(wl, cmd_tx, cmd, sizeof(*cmd));
-        if (ret < 0) {
+        if (ret < 0)
                 wl1251_error("tx %s cmd for channel %d failed",
                              enable ? "start" : "stop", channel);
-                goto out;
-        }
-
-        wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
-                     enable ? "start" : "stop", channel);
+        else
+                wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
+                             enable ? "start" : "stop", channel);
 
-out:
         kfree(cmd);
         return ret;
 }
@@ -410,7 +429,9 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
         struct wl1251_cmd_scan *cmd;
         int i, ret = 0;
 
-        wl1251_debug(DEBUG_CMD, "cmd scan");
+        wl1251_debug(DEBUG_CMD, "cmd scan channels %d", n_channels);
+
+        WARN_ON(n_channels > SCAN_MAX_NUM_OF_CHANNELS);
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
         if (!cmd)
@@ -421,6 +442,13 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
                                                     CFG_RX_MGMT_EN |
                                                     CFG_RX_BCN_EN);
         cmd->params.scan_options = 0;
+        /*
+         * Use high priority scan when not associated to prevent fw issue
+         * causing never-ending scans (sometimes 20+ minutes).
+         * Note: This bug may be caused by the fw's DTIM handling.
+         */
+        if (is_zero_ether_addr(wl->bssid))
+                cmd->params.scan_options |= WL1251_SCAN_OPT_PRIORITY_HIGH;
         cmd->params.num_channels = n_channels;
         cmd->params.num_probe_requests = n_probes;
         cmd->params.tx_rate = cpu_to_le16(1 << 1); /* 2 Mbps */
diff --git a/drivers/net/wireless/ti/wl1251/cmd.h b/drivers/net/wireless/ti/wl1251/cmd.h
index ee4f2b391822..d824ff978311 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.h
+++ b/drivers/net/wireless/ti/wl1251/cmd.h
@@ -35,7 +35,8 @@ int wl1251_cmd_interrogate(struct wl1251 *wl, u16 id, void *buf, size_t len);
 int wl1251_cmd_configure(struct wl1251 *wl, u16 id, void *buf, size_t len);
 int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
                    void *bitmap, u16 bitmap_len, u8 bitmap_control);
-int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable);
+int wl1251_cmd_data_path_rx(struct wl1251 *wl, u8 channel, bool enable);
+int wl1251_cmd_data_path_tx(struct wl1251 *wl, u8 channel, bool enable);
 int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
                     u16 beacon_interval, u8 dtim_interval);
 int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode);
@@ -167,6 +168,11 @@ struct cmd_read_write_memory {
 #define CMDMBOX_HEADER_LEN 4
 #define CMDMBOX_INFO_ELEM_HEADER_LEN 4
 
+#define WL1251_SCAN_OPT_PASSIVE         1
+#define WL1251_SCAN_OPT_5GHZ_BAND       2
+#define WL1251_SCAN_OPT_TRIGGERD_SCAN   4
+#define WL1251_SCAN_OPT_PRIORITY_HIGH   8
+
 #define WL1251_SCAN_MIN_DURATION 30000
 #define WL1251_SCAN_MAX_DURATION 60000
 
diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c
index 74ae8e1c2e33..db0105313745 100644
--- a/drivers/net/wireless/ti/wl1251/event.c
+++ b/drivers/net/wireless/ti/wl1251/event.c
@@ -46,6 +46,43 @@ static int wl1251_event_scan_complete(struct wl1251 *wl,
         return ret;
 }
 
+#define WL1251_PSM_ENTRY_RETRIES  3
+static int wl1251_event_ps_report(struct wl1251 *wl,
+                                  struct event_mailbox *mbox)
+{
+        int ret = 0;
+
+        wl1251_debug(DEBUG_EVENT, "ps status: %x", mbox->ps_status);
+
+        switch (mbox->ps_status) {
+        case EVENT_ENTER_POWER_SAVE_FAIL:
+                wl1251_debug(DEBUG_PSM, "PSM entry failed");
+
+                if (wl->station_mode != STATION_POWER_SAVE_MODE) {
+                        /* remain in active mode */
+                        wl->psm_entry_retry = 0;
+                        break;
+                }
+
+                if (wl->psm_entry_retry < WL1251_PSM_ENTRY_RETRIES) {
+                        wl->psm_entry_retry++;
+                        ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
+                } else {
+                        wl1251_error("Power save entry failed, giving up");
+                        wl->psm_entry_retry = 0;
+                }
+                break;
+        case EVENT_ENTER_POWER_SAVE_SUCCESS:
+        case EVENT_EXIT_POWER_SAVE_FAIL:
+        case EVENT_EXIT_POWER_SAVE_SUCCESS:
+        default:
+                wl->psm_entry_retry = 0;
+                break;
+        }
+
+        return 0;
+}
+
 static void wl1251_event_mbox_dump(struct event_mailbox *mbox)
 {
         wl1251_debug(DEBUG_EVENT, "MBOX DUMP:");
@@ -80,7 +117,14 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox)
                 }
         }
 
-        if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) {
+        if (vector & PS_REPORT_EVENT_ID) {
+                wl1251_debug(DEBUG_EVENT, "PS_REPORT_EVENT");
+                ret = wl1251_event_ps_report(wl, mbox);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (wl->vif && vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) {
                 wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT");
 
                 /* indicate to the stack, that beacons have been lost */
diff --git a/drivers/net/wireless/ti/wl1251/event.h b/drivers/net/wireless/ti/wl1251/event.h
index 30eb5d150bf7..88570a5cd042 100644
--- a/drivers/net/wireless/ti/wl1251/event.h
+++ b/drivers/net/wireless/ti/wl1251/event.h
@@ -112,6 +112,13 @@ struct event_mailbox {
         u8 padding[19];
 } __packed;
 
+enum {
+        EVENT_ENTER_POWER_SAVE_FAIL = 0,
+        EVENT_ENTER_POWER_SAVE_SUCCESS,
+        EVENT_EXIT_POWER_SAVE_FAIL,
+        EVENT_EXIT_POWER_SAVE_SUCCESS,
+};
+
 int wl1251_event_unmask(struct wl1251 *wl);
 void wl1251_event_mbox_config(struct wl1251 *wl);
 int wl1251_event_handle(struct wl1251 *wl, u8 mbox);
diff --git a/drivers/net/wireless/ti/wl1251/init.c b/drivers/net/wireless/ti/wl1251/init.c
index 89b43d35473c..1d799bffaa9f 100644
--- a/drivers/net/wireless/ti/wl1251/init.c
+++ b/drivers/net/wireless/ti/wl1251/init.c
@@ -33,7 +33,7 @@ int wl1251_hw_init_hwenc_config(struct wl1251 *wl)
 {
         int ret;
 
-        ret = wl1251_acx_feature_cfg(wl);
+        ret = wl1251_acx_feature_cfg(wl, 0);
         if (ret < 0) {
                 wl1251_warning("couldn't set feature config");
                 return ret;
@@ -127,7 +127,7 @@ int wl1251_hw_init_phy_config(struct wl1251 *wl)
         if (ret < 0)
                 return ret;
 
-        ret = wl1251_acx_group_address_tbl(wl);
+        ret = wl1251_acx_group_address_tbl(wl, true, NULL, 0);
         if (ret < 0)
                 return ret;
 
@@ -394,8 +394,13 @@ int wl1251_hw_init(struct wl1251 *wl)
         if (ret < 0)
                 goto out_free_data_path;
 
-        /* Enable data path */
-        ret = wl1251_cmd_data_path(wl, wl->channel, 1);
+        /* Enable rx data path */
+        ret = wl1251_cmd_data_path_rx(wl, wl->channel, 1);
+        if (ret < 0)
+                goto out_free_data_path;
+
+        /* Enable tx data path */
+        ret = wl1251_cmd_data_path_tx(wl, wl->channel, 1);
         if (ret < 0)
                 goto out_free_data_path;
 
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index b8a360b43e76..119c148f7740 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -28,6 +28,7 @@
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/netdevice.h>
 
 #include "wl1251.h"
 #include "wl12xx_80211.h"
@@ -479,10 +480,13 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
         wl->next_tx_complete = 0;
         wl->elp = false;
         wl->station_mode = STATION_ACTIVE_MODE;
+        wl->psm_entry_retry = 0;
         wl->tx_queue_stopped = false;
         wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
         wl->rssi_thold = 0;
         wl->channel = WL1251_DEFAULT_CHANNEL;
+        wl->monitor_present = false;
+        wl->joined = false;
 
         wl1251_debugfs_reset(wl);
 
@@ -542,6 +546,7 @@ static void wl1251_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
         wl1251_debug(DEBUG_MAC80211, "mac80211 remove interface");
         wl->vif = NULL;
+        memset(wl->bssid, 0, ETH_ALEN);
         mutex_unlock(&wl->mutex);
 }
 
@@ -566,6 +571,11 @@ static int wl1251_build_qos_null_data(struct wl1251 *wl)
                                        sizeof(template));
 }
 
+static bool wl1251_can_do_pm(struct ieee80211_conf *conf, struct wl1251 *wl)
+{
+        return (conf->flags & IEEE80211_CONF_PS) && !wl->monitor_present;
+}
+
 static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct wl1251 *wl = hw->priv;
@@ -575,8 +585,10 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
         channel = ieee80211_frequency_to_channel(
                         conf->chandef.chan->center_freq);
 
-        wl1251_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d",
+        wl1251_debug(DEBUG_MAC80211,
+                     "mac80211 config ch %d monitor %s psm %s power %d",
                      channel,
+                     conf->flags & IEEE80211_CONF_MONITOR ? "on" : "off",
                      conf->flags & IEEE80211_CONF_PS ? "on" : "off",
                      conf->power_level);
 
@@ -586,16 +598,44 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
         if (ret < 0)
                 goto out;
 
+        if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
+                u32 mode;
+
+                if (conf->flags & IEEE80211_CONF_MONITOR) {
+                        wl->monitor_present = true;
+                        mode = DF_SNIFF_MODE_ENABLE | DF_ENCRYPTION_DISABLE;
+                } else {
+                        wl->monitor_present = false;
+                        mode = 0;
+                }
+
+                ret = wl1251_acx_feature_cfg(wl, mode);
+                if (ret < 0)
+                        goto out_sleep;
+        }
+
         if (channel != wl->channel) {
                 wl->channel = channel;
 
-                ret = wl1251_join(wl, wl->bss_type, wl->channel,
-                                  wl->beacon_int, wl->dtim_period);
+                /*
+                 * Use ENABLE_RX command for channel switching when no
+                 * interface is present (monitor mode only).
+                 * This leaves the tx path disabled in firmware, whereas
+                 * the usual JOIN command seems to transmit some frames
+                 * at firmware level.
+                 */
+                if (wl->vif == NULL) {
+                        wl->joined = false;
+                        ret = wl1251_cmd_data_path_rx(wl, wl->channel, 1);
+                } else {
+                        ret = wl1251_join(wl, wl->bss_type, wl->channel,
+                                          wl->beacon_int, wl->dtim_period);
+                }
                 if (ret < 0)
                         goto out_sleep;
         }
 
-        if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) {
+        if (wl1251_can_do_pm(conf, wl) && !wl->psm_requested) {
                 wl1251_debug(DEBUG_PSM, "psm enabled");
 
                 wl->psm_requested = true;
@@ -611,8 +651,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
                 ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
                 if (ret < 0)
                         goto out_sleep;
-        } else if (!(conf->flags & IEEE80211_CONF_PS) &&
-                   wl->psm_requested) {
+        } else if (!wl1251_can_do_pm(conf, wl) && wl->psm_requested) {
                 wl1251_debug(DEBUG_PSM, "psm disabled");
 
                 wl->psm_requested = false;
@@ -648,6 +687,16 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
                 wl->power_level = conf->power_level;
         }
 
+        /*
+         * Tell stack that connection is lost because hw encryption isn't
+         * supported in monitor mode.
+         * This requires temporary enabling of the hw connection monitor flag
+         */
+        if ((changed & IEEE80211_CONF_CHANGE_MONITOR) && wl->vif) {
+                wl->hw->flags |= IEEE80211_HW_CONNECTION_MONITOR;
+                ieee80211_connection_loss(wl->vif);
+        }
+
 out_sleep:
         wl1251_ps_elp_sleep(wl);
 
@@ -657,6 +706,44 @@ out:
         return ret;
 }
 
+struct wl1251_filter_params {
+        bool enabled;
+        int mc_list_length;
+        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
+};
+
+static u64 wl1251_op_prepare_multicast(struct ieee80211_hw *hw,
+                                       struct netdev_hw_addr_list *mc_list)
+{
+        struct wl1251_filter_params *fp;
+        struct netdev_hw_addr *ha;
+        struct wl1251 *wl = hw->priv;
+
+        if (unlikely(wl->state == WL1251_STATE_OFF))
+                return 0;
+
+        fp = kzalloc(sizeof(*fp), GFP_ATOMIC);
+        if (!fp) {
+                wl1251_error("Out of memory setting filters.");
+                return 0;
+        }
+
+        /* update multicast filtering parameters */
+        fp->mc_list_length = 0;
+        if (netdev_hw_addr_list_count(mc_list) > ACX_MC_ADDRESS_GROUP_MAX) {
+                fp->enabled = false;
+        } else {
+                fp->enabled = true;
+                netdev_hw_addr_list_for_each(ha, mc_list) {
+                        memcpy(fp->mc_list[fp->mc_list_length],
+                                        ha->addr, ETH_ALEN);
+                        fp->mc_list_length++;
+                }
+        }
+
+        return (u64)(unsigned long)fp;
+}
+
 #define WL1251_SUPPORTED_FILTERS (FIF_PROMISC_IN_BSS | \
                                   FIF_ALLMULTI | \
                                   FIF_FCSFAIL | \
@@ -667,8 +754,9 @@ out:
 
 static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed,
-                                       unsigned int *total,u64 multicast)
+                                       unsigned int *total, u64 multicast)
 {
+        struct wl1251_filter_params *fp = (void *)(unsigned long)multicast;
         struct wl1251 *wl = hw->priv;
         int ret;
 
@@ -677,9 +765,11 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
         *total &= WL1251_SUPPORTED_FILTERS;
         changed &= WL1251_SUPPORTED_FILTERS;
 
-        if (changed == 0)
+        if (changed == 0) {
                 /* no filters which we support changed */
+                kfree(fp);
                 return;
+        }
 
         mutex_lock(&wl->mutex);
 
@@ -716,6 +806,15 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
+        if (*total & FIF_ALLMULTI || *total & FIF_PROMISC_IN_BSS)
+                ret = wl1251_acx_group_address_tbl(wl, false, NULL, 0);
+        else if (fp)
+                ret = wl1251_acx_group_address_tbl(wl, fp->enabled,
+                                                   fp->mc_list,
+                                                   fp->mc_list_length);
+        if (ret < 0)
+                goto out;
+
         /* send filters to firmware */
         wl1251_acx_rx_config(wl, wl->rx_config, wl->rx_filter);
 
@@ -723,6 +822,7 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
 
 out:
         mutex_unlock(&wl->mutex);
+        kfree(fp);
 }
 
 /* HW encryption */
@@ -802,12 +902,12 @@ static int wl1251_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         mutex_lock(&wl->mutex);
 
-        ret = wl1251_ps_elp_wakeup(wl);
-        if (ret < 0)
-                goto out_unlock;
-
         switch (cmd) {
         case SET_KEY:
+                if (wl->monitor_present) {
+                        ret = -EOPNOTSUPP;
+                        goto out_unlock;
+                }
                 wl_cmd->key_action = KEY_ADD_OR_REPLACE;
                 break;
         case DISABLE_KEY:
@@ -818,6 +918,10 @@ static int wl1251_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
         }
 
+        ret = wl1251_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out_unlock;
+
         ret = wl1251_set_key_type(wl, wl_cmd, cmd, key, addr);
         if (ret < 0) {
                 wl1251_error("Set KEY type failed");
@@ -930,6 +1034,7 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
         ret = wl1251_cmd_scan(wl, ssid, ssid_len, req->channels,
                               req->n_channels, WL1251_SCAN_NUM_PROBES);
         if (ret < 0) {
+                wl1251_debug(DEBUG_SCAN, "scan failed %d", ret);
                 wl->scanning = false;
                 goto out_idle;
         }
@@ -977,6 +1082,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct wl1251 *wl = hw->priv;
         struct sk_buff *beacon, *skb;
+        bool enable;
         int ret;
 
         wl1251_debug(DEBUG_MAC80211, "mac80211 bss info changed");
@@ -1023,6 +1129,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_ASSOC) {
+                /* Disable temporary enabled hw connection monitor flag */
+                wl->hw->flags &= ~IEEE80211_HW_CONNECTION_MONITOR;
+
                 if (bss_conf->assoc) {
                         wl->beacon_int = bss_conf->beacon_int;
 
@@ -1075,6 +1184,17 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
+        if (changed & BSS_CHANGED_ARP_FILTER) {
+                __be32 addr = bss_conf->arp_addr_list[0];
+                WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
+
+                enable = bss_conf->arp_addr_cnt == 1 && bss_conf->assoc;
+                wl1251_acx_arp_ip_filter(wl, enable, addr);
+
+                if (ret < 0)
+                        goto out_sleep;
+        }
+
         if (changed & BSS_CHANGED_BEACON) {
                 beacon = ieee80211_beacon_get(hw, vif);
                 if (!beacon)
@@ -1245,6 +1365,7 @@ static const struct ieee80211_ops wl1251_ops = {
         .add_interface = wl1251_op_add_interface,
         .remove_interface = wl1251_op_remove_interface,
         .config = wl1251_op_config,
+        .prepare_multicast = wl1251_op_prepare_multicast,
         .configure_filter = wl1251_op_configure_filter,
         .tx = wl1251_op_tx,
         .set_key = wl1251_op_set_key,
@@ -1401,7 +1522,10 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
 
         INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
         wl->channel = WL1251_DEFAULT_CHANNEL;
+        wl->monitor_present = false;
+        wl->joined = false;
         wl->scanning = false;
+        wl->bss_type = MAX_BSS_TYPE;
         wl->default_key = 0;
         wl->listen_int = 1;
         wl->rx_counter = 0;
@@ -1413,6 +1537,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
         wl->elp = false;
         wl->station_mode = STATION_ACTIVE_MODE;
         wl->psm_requested = false;
+        wl->psm_entry_retry = 0;
         wl->tx_queue_stopped = false;
         wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
         wl->rssi_thold = 0;
@@ -1478,3 +1603,4 @@ MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kvalo@adurom.com>");
 MODULE_FIRMWARE(WL1251_FW_NAME);
+MODULE_FIRMWARE(WL1251_NVS_NAME);
diff --git a/drivers/net/wireless/ti/wl1251/rx.c b/drivers/net/wireless/ti/wl1251/rx.c
index 23289d49dd31..123c4bb50e0a 100644
--- a/drivers/net/wireless/ti/wl1251/rx.c
+++ b/drivers/net/wireless/ti/wl1251/rx.c
@@ -83,7 +83,7 @@ static void wl1251_rx_status(struct wl1251 *wl,
 
         status->flag |= RX_FLAG_MACTIME_START;
 
-        if (desc->flags & RX_DESC_ENCRYPTION_MASK) {
+        if (!wl->monitor_present && (desc->flags & RX_DESC_ENCRYPTION_MASK)) {
                 status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;
 
                 if (likely(!(desc->flags & RX_DESC_DECRYPT_FAIL)))
diff --git a/drivers/net/wireless/ti/wl1251/tx.c b/drivers/net/wireless/ti/wl1251/tx.c
index 28121c590a2b..81de83c6fcf6 100644
--- a/drivers/net/wireless/ti/wl1251/tx.c
+++ b/drivers/net/wireless/ti/wl1251/tx.c
@@ -28,6 +28,7 @@
 #include "tx.h"
 #include "ps.h"
 #include "io.h"
+#include "event.h"
 
 static bool wl1251_tx_double_buffer_busy(struct wl1251 *wl, u32 data_out_count)
 {
@@ -89,8 +90,12 @@ static void wl1251_tx_control(struct tx_double_buffer_desc *tx_hdr,
         /* 802.11 packets */
         tx_hdr->control.packet_type = 0;
 
-        if (control->flags & IEEE80211_TX_CTL_NO_ACK)
+        /* Also disable retry and ACK policy for injected packets */
+        if ((control->flags & IEEE80211_TX_CTL_NO_ACK) ||
+            (control->flags & IEEE80211_TX_CTL_INJECTED)) {
+                tx_hdr->control.rate_policy = 1;
                 tx_hdr->control.ack_policy = 1;
+        }
 
         tx_hdr->control.tx_complete = 1;
 
@@ -277,6 +282,26 @@ static void wl1251_tx_trigger(struct wl1251 *wl)
                 TX_STATUS_DATA_OUT_COUNT_MASK;
 }
 
+static void enable_tx_for_packet_injection(struct wl1251 *wl)
+{
+        int ret;
+
+        ret = wl1251_cmd_join(wl, BSS_TYPE_STA_BSS, wl->channel,
+                              wl->beacon_int, wl->dtim_period);
+        if (ret < 0) {
+                wl1251_warning("join failed");
+                return;
+        }
+
+        ret = wl1251_event_wait(wl, JOIN_EVENT_COMPLETE_ID, 100);
+        if (ret < 0) {
+                wl1251_warning("join timeout");
+                return;
+        }
+
+        wl->joined = true;
+}
+
 /* caller must hold wl->mutex */
 static int wl1251_tx_frame(struct wl1251 *wl, struct sk_buff *skb)
 {
@@ -287,6 +312,9 @@ static int wl1251_tx_frame(struct wl1251 *wl, struct sk_buff *skb)
         info = IEEE80211_SKB_CB(skb);
 
         if (info->control.hw_key) {
+                if (unlikely(wl->monitor_present))
+                        return -EINVAL;
+
                 idx = info->control.hw_key->hw_key_idx;
                 if (unlikely(wl->default_key != idx)) {
                         ret = wl1251_acx_default_key(wl, idx);
@@ -295,6 +323,10 @@ static int wl1251_tx_frame(struct wl1251 *wl, struct sk_buff *skb)
                 }
         }
 
+        /* Enable tx path in monitor mode for packet injection */
+        if ((wl->vif == NULL) && !wl->joined)
+                enable_tx_for_packet_injection(wl);
+
         ret = wl1251_tx_path_status(wl);
         if (ret < 0)
                 return ret;
@@ -394,6 +426,7 @@ static void wl1251_tx_packet_cb(struct wl1251 *wl,
         info = IEEE80211_SKB_CB(skb);
 
         if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
+            !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
             (result->status == TX_SUCCESS))
                 info->flags |= IEEE80211_TX_STAT_ACK;
 
diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
index 2c3bd1bff3f6..235617a7716d 100644
--- a/drivers/net/wireless/ti/wl1251/wl1251.h
+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
@@ -93,6 +93,7 @@ enum {
         } while (0)
 
 #define WL1251_DEFAULT_RX_CONFIG (CFG_UNI_FILTER_EN |   \
+                                  CFG_MC_FILTER_EN |    \
                                   CFG_BSSID_FILTER_EN)
 
 #define WL1251_DEFAULT_RX_FILTER (CFG_RX_PRSP_EN |  \
@@ -303,6 +304,8 @@ struct wl1251 {
         u8 bss_type;
         u8 listen_int;
         int channel;
+        bool monitor_present;
+        bool joined;
 
         void *target_mem_map;
         struct acx_data_path_params_resp *data_path;
@@ -368,6 +371,9 @@ struct wl1251 {
         /* PSM mode requested */
         bool psm_requested;
 
+        /* retry counter for PSM entries */
+        u8 psm_entry_retry;
+
         u16 beacon_int;
         u8 dtim_period;
 
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 1477d7f05905..d24d4a958c67 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -29,7 +29,6 @@
 
 #include <linux/delay.h>
 #include <linux/types.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index c955fc39d69a..4c76bcb9a879 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -143,6 +143,7 @@ struct xenvif {
         char rx_irq_name[IFNAMSIZ+4]; /* DEVNAME-rx */
         struct xen_netif_rx_back_ring rx;
         struct sk_buff_head rx_queue;
+        bool rx_queue_stopped;
         /* Set when the RX interrupt is triggered by the frontend.
          * The worker thread may need to wake the queue.
          */
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 4f81ac0e2f0a..27385639b6e5 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -476,7 +476,8 @@ static void xenvif_rx_action(struct xenvif *vif)
         int ret;
         unsigned long offset;
         struct skb_cb_overlay *sco;
-        int need_to_notify = 0;
+        bool need_to_notify = false;
+        bool ring_full = false;
 
         struct netrx_pending_operations npo = {
                 .copy  = vif->grant_copy_op,
@@ -508,7 +509,8 @@ static void xenvif_rx_action(struct xenvif *vif)
                 /* If the skb may not fit then bail out now */
                 if (!xenvif_rx_ring_slots_available(vif, max_slots_needed)) {
                         skb_queue_head(&vif->rx_queue, skb);
-                        need_to_notify = 1;
+                        need_to_notify = true;
+                        ring_full = true;
                         break;
                 }
 
@@ -521,6 +523,8 @@ static void xenvif_rx_action(struct xenvif *vif)
 
         BUG_ON(npo.meta_prod > ARRAY_SIZE(vif->meta));
 
+        vif->rx_queue_stopped = !npo.copy_prod && ring_full;
+
         if (!npo.copy_prod)
                 goto done;
 
@@ -592,8 +596,7 @@ static void xenvif_rx_action(struct xenvif *vif)
 
                 RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret);
 
-                if (ret)
-                        need_to_notify = 1;
+                need_to_notify |= !!ret;
 
                 npo.meta_cons += sco->meta_slots_used;
                 dev_kfree_skb(skb);
@@ -1724,7 +1727,8 @@ static struct xen_netif_rx_response *make_rx_response(struct xenvif *vif,
 
 static inline int rx_work_todo(struct xenvif *vif)
 {
-        return !skb_queue_empty(&vif->rx_queue) || vif->rx_event;
+        return (!skb_queue_empty(&vif->rx_queue) && !vif->rx_queue_stopped) ||
+                vif->rx_event;
 }
 
 static inline int tx_work_todo(struct xenvif *vif)
diff --git a/drivers/ssb/driver_chipcommon_sflash.c b/drivers/ssb/driver_chipcommon_sflash.c
index 50328de712fa..937fc31971a7 100644
--- a/drivers/ssb/driver_chipcommon_sflash.c
+++ b/drivers/ssb/driver_chipcommon_sflash.c
@@ -37,7 +37,7 @@ static const struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
         { "M25P32", 0x15, 0x10000, 64, },
         { "M25P64", 0x16, 0x10000, 128, },
         { "M25FL128", 0x17, 0x10000, 256, },
-        { 0 },
+        { NULL },
 };
 
 static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
@@ -55,7 +55,7 @@ static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
         { "SST25VF016", 0x41, 0x1000, 512, },
         { "SST25VF032", 0x4a, 0x1000, 1024, },
         { "SST25VF064", 0x4b, 0x1000, 2048, },
-        { 0 },
+        { NULL },
 };
 
 static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
@@ -66,7 +66,7 @@ static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
         { "AT45DB161", 0x2c, 512, 4096, },
         { "AT45DB321", 0x34, 512, 8192, },
         { "AT45DB642", 0x3c, 1024, 8192, },
-        { 0 },
+        { NULL },
 };
 
 static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 9f03feedc8e7..d8836623f36a 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -23,6 +23,15 @@
 /*
  * Vendors and devices.  Sort key: vendor first, device next.
  */
+#define SDIO_VENDOR_ID_BROADCOM                 0x02d0
+#define SDIO_DEVICE_ID_BROADCOM_43143           43143
+#define SDIO_DEVICE_ID_BROADCOM_43241           0x4324
+#define SDIO_DEVICE_ID_BROADCOM_4329            0x4329
+#define SDIO_DEVICE_ID_BROADCOM_4330            0x4330
+#define SDIO_DEVICE_ID_BROADCOM_4334            0x4334
+#define SDIO_DEVICE_ID_BROADCOM_4335_4339       0x4335
+#define SDIO_DEVICE_ID_BROADCOM_43362           43362
+
 #define SDIO_VENDOR_ID_INTEL                    0x0089
 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX      0x1402
 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI       0x1403
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index cc2da73055fa..66c1cd87bfe7 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -83,7 +83,8 @@
 enum {
         HCI_QUIRK_RESET_ON_CLOSE,
         HCI_QUIRK_RAW_DEVICE,
-        HCI_QUIRK_FIXUP_BUFFER_SIZE
+        HCI_QUIRK_FIXUP_BUFFER_SIZE,
+        HCI_QUIRK_BROKEN_STORED_LINK_KEY,
 };
 
 /* HCI device flags */
@@ -131,6 +132,7 @@ enum {
         HCI_PERIODIC_INQ,
         HCI_FAST_CONNECTABLE,
         HCI_BREDR_ENABLED,
+        HCI_6LOWPAN_ENABLED,
 };
 
 /* A mask for the flags that are supposed to remain when a reset happens
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b796161fb04e..f2f0cf5865c4 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -448,6 +448,7 @@ enum {
         HCI_CONN_SSP_ENABLED,
         HCI_CONN_POWER_SAVE,
         HCI_CONN_REMOTE_OOB,
+        HCI_CONN_6LOWPAN,
 };
 
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index e149e992fdae..dbc4a89984ca 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -136,6 +136,7 @@ struct l2cap_conninfo {
 #define L2CAP_FC_L2CAP          0x02
 #define L2CAP_FC_CONNLESS       0x04
 #define L2CAP_FC_A2MP           0x08
+#define L2CAP_FC_6LOWPAN        0x3e /* reserved and temporary value */
 
 /* L2CAP Control Field bit masks */
 #define L2CAP_CTRL_SAR                  0xC000
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 80a10212b1b9..56c597793d6d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1972,6 +1972,50 @@ struct cfg80211_mgmt_tx_params {
 };
 
 /**
+ * struct cfg80211_dscp_exception - DSCP exception
+ *
+ * @dscp: DSCP value that does not adhere to the user priority range definition
+ * @up: user priority value to which the corresponding DSCP value belongs
+ */
+struct cfg80211_dscp_exception {
+        u8 dscp;
+        u8 up;
+};
+
+/**
+ * struct cfg80211_dscp_range - DSCP range definition for user priority
+ *
+ * @low: lowest DSCP value of this user priority range, inclusive
+ * @high: highest DSCP value of this user priority range, inclusive
+ */
+struct cfg80211_dscp_range {
+        u8 low;
+        u8 high;
+};
+
+/* QoS Map Set element length defined in IEEE Std 802.11-2012, 8.4.2.97 */
+#define IEEE80211_QOS_MAP_MAX_EX        21
+#define IEEE80211_QOS_MAP_LEN_MIN       16
+#define IEEE80211_QOS_MAP_LEN_MAX \
+        (IEEE80211_QOS_MAP_LEN_MIN + 2 * IEEE80211_QOS_MAP_MAX_EX)
+
+/**
+ * struct cfg80211_qos_map - QoS Map Information
+ *
+ * This struct defines the Interworking QoS map setting for DSCP values
+ *
+ * @num_des: number of DSCP exceptions (0..21)
+ * @dscp_exception: optionally up to maximum of 21 DSCP exceptions from
+ *      the user priority DSCP range definition
+ * @up: DSCP range definition for a particular user priority
+ */
+struct cfg80211_qos_map {
+        u8 num_des;
+        struct cfg80211_dscp_exception dscp_exception[IEEE80211_QOS_MAP_MAX_EX];
+        struct cfg80211_dscp_range up[8];
+};
+
+/**
  * struct cfg80211_ops - backend description for wireless configuration
  *
  * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2213,6 +2257,8 @@ struct cfg80211_mgmt_tx_params {
  * @set_coalesce: Set coalesce parameters.
  *
  * @channel_switch: initiate channel-switch procedure (with CSA)
+ *
+ * @set_qos_map: Set QoS mapping information to the driver
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -2454,6 +2500,9 @@ struct cfg80211_ops {
         int     (*channel_switch)(struct wiphy *wiphy,
                                   struct net_device *dev,
                                   struct cfg80211_csa_settings *params);
+        int     (*set_qos_map)(struct wiphy *wiphy,
+                               struct net_device *dev,
+                               struct cfg80211_qos_map *qos_map);
 };
 
 /*
@@ -2824,6 +2873,8 @@ struct wiphy_vendor_command {
  *
  * @vendor_commands: array of vendor commands supported by the hardware
  * @n_vendor_commands: number of vendor commands
+ * @vendor_events: array of vendor events supported by the hardware
+ * @n_vendor_events: number of vendor events
  */
 struct wiphy {
         /* assign these fields before you register the wiphy */
@@ -2936,7 +2987,8 @@ struct wiphy {
         const struct wiphy_coalesce_support *coalesce;
 
         const struct wiphy_vendor_command *vendor_commands;
-        int n_vendor_commands;
+        const struct nl80211_vendor_cmd_info *vendor_events;
+        int n_vendor_commands, n_vendor_events;
 
         char priv[0] __aligned(NETDEV_ALIGN);
 };
@@ -3429,9 +3481,11 @@ 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
+ * @qos_map: Interworking QoS mapping or %NULL if not in use
  * Return: The 802.1p/1d tag.
  */
-unsigned int cfg80211_classify8021d(struct sk_buff *skb);
+unsigned int cfg80211_classify8021d(struct sk_buff *skb,
+                                    struct cfg80211_qos_map *qos_map);
 
 /**
  * cfg80211_find_ie - find information element in data
@@ -3907,6 +3961,14 @@ struct sk_buff *__cfg80211_alloc_reply_skb(struct wiphy *wiphy,
                                            enum nl80211_attrs attr,
                                            int approxlen);
 
+struct sk_buff *__cfg80211_alloc_event_skb(struct wiphy *wiphy,
+                                           enum nl80211_commands cmd,
+                                           enum nl80211_attrs attr,
+                                           int vendor_event_idx,
+                                           int approxlen, gfp_t gfp);
+
+void __cfg80211_send_event_skb(struct sk_buff *skb, gfp_t gfp);
+
 /**
  * cfg80211_vendor_cmd_alloc_reply_skb - allocate vendor command reply
  * @wiphy: the wiphy
@@ -3951,6 +4013,44 @@ cfg80211_vendor_cmd_alloc_reply_skb(struct wiphy *wiphy, int approxlen)
  */
 int cfg80211_vendor_cmd_reply(struct sk_buff *skb);
 
+/**
+ * cfg80211_vendor_event_alloc - allocate vendor-specific event skb
+ * @wiphy: the wiphy
+ * @event_idx: index of the vendor event in the wiphy's vendor_events
+ * @approxlen: an upper bound of the length of the data that will
+ *      be put into the skb
+ * @gfp: allocation flags
+ *
+ * This function allocates and pre-fills an skb for an event on the
+ * vendor-specific multicast group.
+ *
+ * When done filling the skb, call cfg80211_vendor_event() with the
+ * skb to send the event.
+ *
+ * Return: An allocated and pre-filled skb. %NULL if any errors happen.
+ */
+static inline struct sk_buff *
+cfg80211_vendor_event_alloc(struct wiphy *wiphy, int approxlen,
+                            int event_idx, gfp_t gfp)
+{
+        return __cfg80211_alloc_event_skb(wiphy, NL80211_CMD_VENDOR,
+                                          NL80211_ATTR_VENDOR_DATA,
+                                          event_idx, approxlen, gfp);
+}
+
+/**
+ * cfg80211_vendor_event - send the event
+ * @skb: The skb, must have been allocated with cfg80211_vendor_event_alloc()
+ * @gfp: allocation flags
+ *
+ * This function sends the given @skb, which must have been allocated
+ * by cfg80211_vendor_event_alloc(), as an event. It always consumes it.
+ */
+static inline void cfg80211_vendor_event(struct sk_buff *skb, gfp_t gfp)
+{
+        __cfg80211_send_event_skb(skb, gfp);
+}
+
 #ifdef CONFIG_NL80211_TESTMODE
 /**
  * DOC: Test mode
@@ -4031,8 +4131,13 @@ static inline int cfg80211_testmode_reply(struct sk_buff *skb)
  *
  * 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);
+static inline struct sk_buff *
+cfg80211_testmode_alloc_event_skb(struct wiphy *wiphy, int approxlen, gfp_t gfp)
+{
+        return __cfg80211_alloc_event_skb(wiphy, NL80211_CMD_TESTMODE,
+                                          NL80211_ATTR_TESTDATA, -1,
+                                          approxlen, gfp);
+}
 
 /**
  * cfg80211_testmode_event - send the event
@@ -4044,7 +4149,10 @@ struct sk_buff *cfg80211_testmode_alloc_event_skb(struct wiphy *wiphy,
  * by cfg80211_testmode_alloc_event_skb(), as an event. It always
  * consumes it.
  */
-void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp);
+static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
+{
+        __cfg80211_send_event_skb(skb, gfp);
+}
 
 #define CFG80211_TESTMODE_CMD(cmd)      .testmode_cmd = (cmd),
 #define CFG80211_TESTMODE_DUMP(cmd)     .testmode_dump = (cmd),
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 531785f5819e..f838af816b56 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4652,4 +4652,51 @@ bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif, struct sk_buff *skb,
                               int band, struct ieee80211_sta **sta);
 
+/**
+ * struct ieee80211_noa_data - holds temporary data for tracking P2P NoA state
+ *
+ * @next_tsf: TSF timestamp of the next absent state change
+ * @has_next_tsf: next absent state change event pending
+ *
+ * @absent: descriptor bitmask, set if GO is currently absent
+ *
+ * private:
+ *
+ * @count: count fields from the NoA descriptors
+ * @desc: adjusted data from the NoA
+ */
+struct ieee80211_noa_data {
+        u32 next_tsf;
+        bool has_next_tsf;
+
+        u8 absent;
+
+        u8 count[IEEE80211_P2P_NOA_DESC_MAX];
+        struct {
+                u32 start;
+                u32 duration;
+                u32 interval;
+        } desc[IEEE80211_P2P_NOA_DESC_MAX];
+};
+
+/**
+ * ieee80211_parse_p2p_noa - initialize NoA tracking data from P2P IE
+ *
+ * @attr: P2P NoA IE
+ * @data: NoA tracking data
+ * @tsf: current TSF timestamp
+ *
+ * Return: number of successfully parsed descriptors
+ */
+int ieee80211_parse_p2p_noa(const struct ieee80211_p2p_noa_attr *attr,
+                            struct ieee80211_noa_data *data, u32 tsf);
+
+/**
+ * ieee80211_update_p2p_noa - get next pending P2P GO absent state change
+ *
+ * @data: NoA tracking data
+ * @tsf: current TSF timestamp
+ */
+void ieee80211_update_p2p_noa(struct ieee80211_noa_data *data, u32 tsf);
+
 #endif /* MAC80211_H */
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 5a91abfc0c30..57c8ff7955df 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -13,9 +13,10 @@ struct nft_pktinfo {
         struct sk_buff                  *skb;
         const struct net_device         *in;
         const struct net_device         *out;
-        u8                              hooknum;
+        const struct nf_hook_ops        *ops;
         u8                              nhoff;
         u8                              thoff;
+        u8                              tprot;
         /* for x_tables compatibility */
         struct xt_action_param          xt;
 };
@@ -29,7 +30,8 @@ static inline void nft_set_pktinfo(struct nft_pktinfo *pkt,
         pkt->skb = skb;
         pkt->in = pkt->xt.in = in;
         pkt->out = pkt->xt.out = out;
-        pkt->hooknum = pkt->xt.hooknum = ops->hooknum;
+        pkt->ops = ops;
+        pkt->xt.hooknum = ops->hooknum;
         pkt->xt.family = ops->pf;
 }
 
@@ -421,6 +423,8 @@ struct nft_stats {
         u64 pkts;
 };
 
+#define NFT_HOOK_OPS_MAX                2
+
 /**
  *      struct nft_base_chain - nf_tables base chain
  *
@@ -431,8 +435,8 @@ struct nft_stats {
  *      @chain: the chain
  */
 struct nft_base_chain {
-        struct nf_hook_ops              ops;
-        enum nft_chain_type             type;
+        struct nf_hook_ops              ops[NFT_HOOK_OPS_MAX];
+        const struct nf_chain_type      *type;
         u8                              policy;
         struct nft_stats __percpu       *stats;
         struct nft_chain                chain;
@@ -443,8 +447,8 @@ static inline struct nft_base_chain *nft_base_chain(const struct nft_chain *chai
         return container_of(chain, struct nft_base_chain, chain);
 }
 
-unsigned int nft_do_chain_pktinfo(struct nft_pktinfo *pkt,
-                                  const struct nf_hook_ops *ops);
+unsigned int nft_do_chain(struct nft_pktinfo *pkt,
+                          const struct nf_hook_ops *ops);
 
 /**
  *      struct nft_table - nf_tables table
@@ -475,6 +479,8 @@ struct nft_table {
  *      @nhooks: number of hooks in this family
  *      @owner: module owner
  *      @tables: used internally
+ *      @nops: number of hook ops in this family
+ *      @hook_ops_init: initialization function for chain hook ops
  *      @hooks: hookfn overrides for packet validation
  */
 struct nft_af_info {
@@ -483,23 +489,36 @@ struct nft_af_info {
         unsigned int                    nhooks;
         struct module                   *owner;
         struct list_head                tables;
+        unsigned int                    nops;
+        void                            (*hook_ops_init)(struct nf_hook_ops *,
+                                                         unsigned int);
         nf_hookfn                       *hooks[NF_MAX_HOOKS];
 };
 
 int nft_register_afinfo(struct net *, struct nft_af_info *);
 void nft_unregister_afinfo(struct nft_af_info *);
 
+/**
+ *      struct nf_chain_type - nf_tables chain type info
+ *
+ *      @name: name of the type
+ *      @type: numeric identifier
+ *      @family: address family
+ *      @owner: module owner
+ *      @hook_mask: mask of valid hooks
+ *      @hooks: hookfn overrides
+ */
 struct nf_chain_type {
-        unsigned int            hook_mask;
-        const char              *name;
-        enum nft_chain_type     type;
-        nf_hookfn               *fn[NF_MAX_HOOKS];
-        struct module           *me;
-        int                     family;
+        const char                      *name;
+        enum nft_chain_type             type;
+        int                             family;
+        struct module                   *owner;
+        unsigned int                    hook_mask;
+        nf_hookfn                       *hooks[NF_MAX_HOOKS];
 };
 
-int nft_register_chain_type(struct nf_chain_type *);
-void nft_unregister_chain_type(struct nf_chain_type *);
+int nft_register_chain_type(const struct nf_chain_type *);
+void nft_unregister_chain_type(const struct nf_chain_type *);
 
 int nft_register_expr(struct nft_expr_type *);
 void nft_unregister_expr(struct nft_expr_type *);
diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
index 1be1c2c197ee..cba143fbd2e4 100644
--- a/include/net/netfilter/nf_tables_ipv4.h
+++ b/include/net/netfilter/nf_tables_ipv4.h
@@ -15,9 +15,12 @@ nft_set_pktinfo_ipv4(struct nft_pktinfo *pkt,
 
         nft_set_pktinfo(pkt, ops, skb, in, out);
 
-        pkt->xt.thoff = ip_hdrlen(pkt->skb);
         ip = ip_hdr(pkt->skb);
+        pkt->tprot = ip->protocol;
+        pkt->xt.thoff = ip_hdrlen(pkt->skb);
         pkt->xt.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
 }
 
+extern struct nft_af_info nft_af_ipv4;
+
 #endif
diff --git a/include/net/netfilter/nf_tables_ipv6.h b/include/net/netfilter/nf_tables_ipv6.h
index 4a9b88a65963..74d976137658 100644
--- a/include/net/netfilter/nf_tables_ipv6.h
+++ b/include/net/netfilter/nf_tables_ipv6.h
@@ -21,10 +21,13 @@ nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
         if (protohdr < 0)
                 return -1;
 
+        pkt->tprot = protohdr;
         pkt->xt.thoff = thoff;
         pkt->xt.fragoff = frag_off;
 
         return 0;
 }
 
+extern struct nft_af_info nft_af_ipv6;
+
 #endif
diff --git a/include/net/netns/nftables.h b/include/net/netns/nftables.h
index 15d056d534e3..26a394cb91a8 100644
--- a/include/net/netns/nftables.h
+++ b/include/net/netns/nftables.h
@@ -10,6 +10,7 @@ struct netns_nftables {
         struct list_head        commit_list;
         struct nft_af_info      *ipv4;
         struct nft_af_info      *ipv6;
+        struct nft_af_info      *inet;
         struct nft_af_info      *arp;
         struct nft_af_info      *bridge;
         u8                      gencursor;
diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h
index d7fea3496f32..4d024d75d64b 100644
--- a/include/uapi/linux/if_arp.h
+++ b/include/uapi/linux/if_arp.h
@@ -94,6 +94,7 @@
 #define ARPHRD_CAIF     822             /* CAIF media type              */
 #define ARPHRD_IP6GRE   823             /* GRE over IPv6                */
 #define ARPHRD_NETLINK  824             /* Netlink header               */
+#define ARPHRD_6LOWPAN  825             /* IPv6 over LoWPAN             */
 
 #define ARPHRD_VOID       0xFFFF        /* Void type, nothing is known */
 #define ARPHRD_NONE       0xFFFE        /* zero header length */
diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
index f7dc0ebeeba5..ef1b1f88ca18 100644
--- a/include/uapi/linux/netfilter.h
+++ b/include/uapi/linux/netfilter.h
@@ -53,6 +53,7 @@ enum nf_inet_hooks {
 
 enum {
         NFPROTO_UNSPEC =  0,
+        NFPROTO_INET   =  1,
         NFPROTO_IPV4   =  2,
         NFPROTO_ARP    =  3,
         NFPROTO_BRIDGE =  7,
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index 2344f5a319fc..1d973d2ba417 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -58,6 +58,7 @@ header-y += xt_helper.h
 header-y += xt_ipcomp.h
 header-y += xt_iprange.h
 header-y += xt_ipvs.h
+header-y += xt_l2tp.h
 header-y += xt_length.h
 header-y += xt_limit.h
 header-y += xt_mac.h
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index aa86a15293e1..83c985a6170b 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -531,6 +531,8 @@ enum nft_exthdr_attributes {
  * @NFT_META_NFTRACE: packet nftrace bit
  * @NFT_META_RTCLASSID: realm value of packet's route (skb->dst->tclassid)
  * @NFT_META_SECMARK: packet secmark (skb->secmark)
+ * @NFT_META_NFPROTO: netfilter protocol
+ * @NFT_META_L4PROTO: layer 4 protocol number
  */
 enum nft_meta_keys {
         NFT_META_LEN,
@@ -548,6 +550,8 @@ enum nft_meta_keys {
         NFT_META_NFTRACE,
         NFT_META_RTCLASSID,
         NFT_META_SECMARK,
+        NFT_META_NFPROTO,
+        NFT_META_L4PROTO,
 };
 
 /**
@@ -605,12 +609,14 @@ enum nft_ct_keys {
  * @NFTA_CT_DREG: destination register (NLA_U32)
  * @NFTA_CT_KEY: conntrack data item to load (NLA_U32: nft_ct_keys)
  * @NFTA_CT_DIRECTION: direction in case of directional keys (NLA_U8)
+ * @NFTA_CT_SREG: source register (NLA_U32)
  */
 enum nft_ct_attributes {
         NFTA_CT_UNSPEC,
         NFTA_CT_DREG,
         NFTA_CT_KEY,
         NFTA_CT_DIRECTION,
+        NFTA_CT_SREG,
         __NFTA_CT_MAX
 };
 #define NFTA_CT_MAX             (__NFTA_CT_MAX - 1)
diff --git a/include/uapi/linux/netfilter/xt_l2tp.h b/include/uapi/linux/netfilter/xt_l2tp.h
new file mode 100644
index 000000000000..7dccfa0acbfa
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_l2tp.h
@@ -0,0 +1,27 @@
+#ifndef _LINUX_NETFILTER_XT_L2TP_H
+#define _LINUX_NETFILTER_XT_L2TP_H
+
+#include <linux/types.h>
+
+enum xt_l2tp_type {
+        XT_L2TP_TYPE_CONTROL,
+        XT_L2TP_TYPE_DATA,
+};
+
+/* L2TP matching stuff */
+struct xt_l2tp_info {
+        __u32 tid;                      /* tunnel id */
+        __u32 sid;                      /* session id */
+        __u8 version;                   /* L2TP protocol version */
+        __u8 type;                      /* L2TP packet type */
+        __u8 flags;                     /* which fields to match */
+};
+
+enum {
+        XT_L2TP_TID     = (1 << 0),     /* match L2TP tunnel id */
+        XT_L2TP_SID     = (1 << 1),     /* match L2TP session id */
+        XT_L2TP_VERSION = (1 << 2),     /* match L2TP protocol version */
+        XT_L2TP_TYPE    = (1 << 3),     /* match L2TP packet type */
+};
+
+#endif /* _LINUX_NETFILTER_XT_L2TP_H */
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index e1307909ecf1..91054fd660e0 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -702,6 +702,12 @@
  *      (&struct nl80211_vendor_cmd_info) of the supported vendor commands.
  *      This may also be sent as an event with the same attributes.
  *
+ * @NL80211_CMD_SET_QOS_MAP: Set Interworking QoS mapping for IP DSCP values.
+ *      The QoS mapping information is included in %NL80211_ATTR_QOS_MAP. If
+ *      that attribute is not included, QoS mapping is disabled. Since this
+ *      QoS mapping is relevant for IP packets, it is only valid during an
+ *      association. This is cleared on disassociation and AP restart.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -871,6 +877,8 @@ enum nl80211_commands {
 
         NL80211_CMD_VENDOR,
 
+        NL80211_CMD_SET_QOS_MAP,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1540,6 +1548,12 @@ enum nl80211_commands {
  * @NL80211_ATTR_VENDOR_SUBCMD: vendor sub-command
  * @NL80211_ATTR_VENDOR_DATA: data for the vendor command, if any; this
  *      attribute is also used for vendor command feature advertisement
+ * @NL80211_ATTR_VENDOR_EVENTS: used for event list advertising in the wiphy
+ *      info, containing a nested array of possible events
+ *
+ * @NL80211_ATTR_QOS_MAP: IP DSCP mapping for Interworking QoS mapping. This
+ *      data is in the format defined for the payload of the QoS Map Set element
+ *      in IEEE Std 802.11-2012, 8.4.2.97.
  *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -1865,6 +1879,9 @@ enum nl80211_attrs {
         NL80211_ATTR_VENDOR_ID,
         NL80211_ATTR_VENDOR_SUBCMD,
         NL80211_ATTR_VENDOR_DATA,
+        NL80211_ATTR_VENDOR_EVENTS,
+
+        NL80211_ATTR_QOS_MAP,
 
         /* add attributes here, update the policy in nl80211.c */
 
diff --git a/include/uapi/linux/tcp_metrics.h b/include/uapi/linux/tcp_metrics.h
index cb5157b55f32..54a37b13f2c4 100644
--- a/include/uapi/linux/tcp_metrics.h
+++ b/include/uapi/linux/tcp_metrics.h
@@ -35,6 +35,8 @@ enum {
         TCP_METRICS_ATTR_FOPEN_SYN_DROPS,       /* u16, count of drops */
         TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS,     /* msecs age */
         TCP_METRICS_ATTR_FOPEN_COOKIE,          /* binary */
+        TCP_METRICS_ATTR_SADDR_IPV4,            /* u32 */
+        TCP_METRICS_ATTR_SADDR_IPV6,            /* binary */
 
         __TCP_METRICS_ATTR_MAX,
 };
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
new file mode 100644
index 000000000000..adb3ea04adaa
--- /dev/null
+++ b/net/bluetooth/6lowpan.c
@@ -0,0 +1,860 @@
+/*
+   Copyright (c) 2013 Intel Corp.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 and
+   only version 2 as published by the Free Software Foundation.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+*/
+
+#include <linux/if_arp.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+
+#include <net/ipv6.h>
+#include <net/ip6_route.h>
+#include <net/addrconf.h>
+
+#include <net/af_ieee802154.h> /* to get the address type */
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/l2cap.h>
+
+#include "6lowpan.h"
+
+#include "../ieee802154/6lowpan.h" /* for the compression support */
+
+#define IFACE_NAME_TEMPLATE "bt%d"
+#define EUI64_ADDR_LEN 8
+
+struct skb_cb {
+        struct in6_addr addr;
+        struct l2cap_conn *conn;
+};
+#define lowpan_cb(skb) ((struct skb_cb *)((skb)->cb))
+
+/* The devices list contains those devices that we are acting
+ * as a proxy. The BT 6LoWPAN device is a virtual device that
+ * connects to the Bluetooth LE device. The real connection to
+ * BT device is done via l2cap layer. There exists one
+ * virtual device / one BT 6LoWPAN network (=hciX device).
+ * The list contains struct lowpan_dev elements.
+ */
+static LIST_HEAD(bt_6lowpan_devices);
+static DEFINE_RWLOCK(devices_lock);
+
+struct lowpan_peer {
+        struct list_head list;
+        struct l2cap_conn *conn;
+
+        /* peer addresses in various formats */
+        unsigned char eui64_addr[EUI64_ADDR_LEN];
+        struct in6_addr peer_addr;
+};
+
+struct lowpan_dev {
+        struct list_head list;
+
+        struct hci_dev *hdev;
+        struct net_device *netdev;
+        struct list_head peers;
+        atomic_t peer_count; /* number of items in peers list */
+
+        struct work_struct delete_netdev;
+        struct delayed_work notify_peers;
+};
+
+static inline struct lowpan_dev *lowpan_dev(const struct net_device *netdev)
+{
+        return netdev_priv(netdev);
+}
+
+static inline void peer_add(struct lowpan_dev *dev, struct lowpan_peer *peer)
+{
+        list_add(&peer->list, &dev->peers);
+        atomic_inc(&dev->peer_count);
+}
+
+static inline bool peer_del(struct lowpan_dev *dev, struct lowpan_peer *peer)
+{
+        list_del(&peer->list);
+
+        if (atomic_dec_and_test(&dev->peer_count)) {
+                BT_DBG("last peer");
+                return true;
+        }
+
+        return false;
+}
+
+static inline struct lowpan_peer *peer_lookup_ba(struct lowpan_dev *dev,
+                                                 bdaddr_t *ba, __u8 type)
+{
+        struct lowpan_peer *peer, *tmp;
+
+        BT_DBG("peers %d addr %pMR type %d", atomic_read(&dev->peer_count),
+               ba, type);
+
+        list_for_each_entry_safe(peer, tmp, &dev->peers, list) {
+                BT_DBG("addr %pMR type %d",
+                       &peer->conn->hcon->dst, peer->conn->hcon->dst_type);
+
+                if (bacmp(&peer->conn->hcon->dst, ba))
+                        continue;
+
+                if (type == peer->conn->hcon->dst_type)
+                        return peer;
+        }
+
+        return NULL;
+}
+
+static inline struct lowpan_peer *peer_lookup_conn(struct lowpan_dev *dev,
+                                                   struct l2cap_conn *conn)
+{
+        struct lowpan_peer *peer, *tmp;
+
+        list_for_each_entry_safe(peer, tmp, &dev->peers, list) {
+                if (peer->conn == conn)
+                        return peer;
+        }
+
+        return NULL;
+}
+
+static struct lowpan_peer *lookup_peer(struct l2cap_conn *conn)
+{
+        struct lowpan_dev *entry, *tmp;
+        struct lowpan_peer *peer = NULL;
+        unsigned long flags;
+
+        read_lock_irqsave(&devices_lock, flags);
+
+        list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+                peer = peer_lookup_conn(entry, conn);
+                if (peer)
+                        break;
+        }
+
+        read_unlock_irqrestore(&devices_lock, flags);
+
+        return peer;
+}
+
+static struct lowpan_dev *lookup_dev(struct l2cap_conn *conn)
+{
+        struct lowpan_dev *entry, *tmp;
+        struct lowpan_dev *dev = NULL;
+        unsigned long flags;
+
+        read_lock_irqsave(&devices_lock, flags);
+
+        list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+                if (conn->hcon->hdev == entry->hdev) {
+                        dev = entry;
+                        break;
+                }
+        }
+
+        read_unlock_irqrestore(&devices_lock, flags);
+
+        return dev;
+}
+
+static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)
+{
+        struct sk_buff *skb_cp;
+        int ret;
+
+        skb_cp = skb_copy(skb, GFP_ATOMIC);
+        if (!skb_cp)
+                return -ENOMEM;
+
+        ret = netif_rx(skb_cp);
+
+        BT_DBG("receive skb %d", ret);
+        if (ret < 0)
+                return NET_RX_DROP;
+
+        return ret;
+}
+
+static int process_data(struct sk_buff *skb, struct net_device *netdev,
+                        struct l2cap_conn *conn)
+{
+        const u8 *saddr, *daddr;
+        u8 iphc0, iphc1;
+        struct lowpan_dev *dev;
+        struct lowpan_peer *peer;
+        unsigned long flags;
+
+        dev = lowpan_dev(netdev);
+
+        read_lock_irqsave(&devices_lock, flags);
+        peer = peer_lookup_conn(dev, conn);
+        read_unlock_irqrestore(&devices_lock, flags);
+        if (!peer)
+                goto drop;
+
+        saddr = peer->eui64_addr;
+        daddr = dev->netdev->dev_addr;
+
+        /* at least two bytes will be used for the encoding */
+        if (skb->len < 2)
+                goto drop;
+
+        if (lowpan_fetch_skb_u8(skb, &iphc0))
+                goto drop;
+
+        if (lowpan_fetch_skb_u8(skb, &iphc1))
+                goto drop;
+
+        return lowpan_process_data(skb, netdev,
+                                   saddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
+                                   daddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
+                                   iphc0, iphc1, give_skb_to_upper);
+
+drop:
+        kfree_skb(skb);
+        return -EINVAL;
+}
+
+static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
+                    struct l2cap_conn *conn)
+{
+        struct sk_buff *local_skb;
+        int ret;
+
+        if (!netif_running(dev))
+                goto drop;
+
+        if (dev->type != ARPHRD_6LOWPAN)
+                goto drop;
+
+        /* check that it's our buffer */
+        if (skb->data[0] == LOWPAN_DISPATCH_IPV6) {
+                /* Copy the packet so that the IPv6 header is
+                 * properly aligned.
+                 */
+                local_skb = skb_copy_expand(skb, NET_SKB_PAD - 1,
+                                            skb_tailroom(skb), GFP_ATOMIC);
+                if (!local_skb)
+                        goto drop;
+
+                local_skb->protocol = htons(ETH_P_IPV6);
+                local_skb->pkt_type = PACKET_HOST;
+
+                skb_reset_network_header(local_skb);
+                skb_set_transport_header(local_skb, sizeof(struct ipv6hdr));
+
+                if (give_skb_to_upper(local_skb, dev) != NET_RX_SUCCESS) {
+                        kfree_skb(local_skb);
+                        goto drop;
+                }
+
+                dev->stats.rx_bytes += skb->len;
+                dev->stats.rx_packets++;
+
+                kfree_skb(local_skb);
+                kfree_skb(skb);
+        } else {
+                switch (skb->data[0] & 0xe0) {
+                case LOWPAN_DISPATCH_IPHC:      /* ipv6 datagram */
+                        local_skb = skb_clone(skb, GFP_ATOMIC);
+                        if (!local_skb)
+                                goto drop;
+
+                        ret = process_data(local_skb, dev, conn);
+                        if (ret != NET_RX_SUCCESS)
+                                goto drop;
+
+                        dev->stats.rx_bytes += skb->len;
+                        dev->stats.rx_packets++;
+
+                        kfree_skb(skb);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return NET_RX_SUCCESS;
+
+drop:
+        kfree_skb(skb);
+        return NET_RX_DROP;
+}
+
+/* Packet from BT LE device */
+int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb)
+{
+        struct lowpan_dev *dev;
+        struct lowpan_peer *peer;
+        int err;
+
+        peer = lookup_peer(conn);
+        if (!peer)
+                return -ENOENT;
+
+        dev = lookup_dev(conn);
+        if (!dev || !dev->netdev)
+                return -ENOENT;
+
+        err = recv_pkt(skb, dev->netdev, conn);
+        BT_DBG("recv pkt %d", err);
+
+        return err;
+}
+
+static inline int skbuff_copy(void *msg, int len, int count, int mtu,
+                              struct sk_buff *skb, struct net_device *dev)
+{
+        struct sk_buff **frag;
+        int sent = 0;
+
+        memcpy(skb_put(skb, count), msg, count);
+
+        sent += count;
+        msg  += count;
+        len  -= count;
+
+        dev->stats.tx_bytes += count;
+        dev->stats.tx_packets++;
+
+        raw_dump_table(__func__, "Sending", skb->data, skb->len);
+
+        /* Continuation fragments (no L2CAP header) */
+        frag = &skb_shinfo(skb)->frag_list;
+        while (len > 0) {
+                struct sk_buff *tmp;
+
+                count = min_t(unsigned int, mtu, len);
+
+                tmp = bt_skb_alloc(count, GFP_ATOMIC);
+                if (!tmp)
+                        return -ENOMEM;
+
+                *frag = tmp;
+
+                memcpy(skb_put(*frag, count), msg, count);
+
+                raw_dump_table(__func__, "Sending fragment",
+                               (*frag)->data, count);
+
+                (*frag)->priority = skb->priority;
+
+                sent += count;
+                msg  += count;
+                len  -= count;
+
+                skb->len += (*frag)->len;
+                skb->data_len += (*frag)->len;
+
+                frag = &(*frag)->next;
+
+                dev->stats.tx_bytes += count;
+                dev->stats.tx_packets++;
+        }
+
+        return sent;
+}
+
+static struct sk_buff *create_pdu(struct l2cap_conn *conn, void *msg,
+                                  size_t len, u32 priority,
+                                  struct net_device *dev)
+{
+        struct sk_buff *skb;
+        int err, count;
+        struct l2cap_hdr *lh;
+
+        /* FIXME: This mtu check should be not needed and atm is only used for
+         * testing purposes
+         */
+        if (conn->mtu > (L2CAP_LE_MIN_MTU + L2CAP_HDR_SIZE))
+                conn->mtu = L2CAP_LE_MIN_MTU + L2CAP_HDR_SIZE;
+
+        count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
+
+        BT_DBG("conn %p len %zu mtu %d count %d", conn, len, conn->mtu, count);
+
+        skb = bt_skb_alloc(count + L2CAP_HDR_SIZE, GFP_ATOMIC);
+        if (!skb)
+                return ERR_PTR(-ENOMEM);
+
+        skb->priority = priority;
+
+        lh = (struct l2cap_hdr *)skb_put(skb, L2CAP_HDR_SIZE);
+        lh->cid = cpu_to_le16(L2CAP_FC_6LOWPAN);
+        lh->len = cpu_to_le16(len);
+
+        err = skbuff_copy(msg, len, count, conn->mtu, skb, dev);
+        if (unlikely(err < 0)) {
+                kfree_skb(skb);
+                BT_DBG("skbuff copy %d failed", err);
+                return ERR_PTR(err);
+        }
+
+        return skb;
+}
+
+static int conn_send(struct l2cap_conn *conn,
+                     void *msg, size_t len, u32 priority,
+                     struct net_device *dev)
+{
+        struct sk_buff *skb;
+
+        skb = create_pdu(conn, msg, len, priority, dev);
+        if (IS_ERR(skb))
+                return -EINVAL;
+
+        BT_DBG("conn %p skb %p len %d priority %u", conn, skb, skb->len,
+               skb->priority);
+
+        hci_send_acl(conn->hchan, skb, ACL_START);
+
+        return 0;
+}
+
+static void get_dest_bdaddr(struct in6_addr *ip6_daddr,
+                            bdaddr_t *addr, u8 *addr_type)
+{
+        u8 *eui64;
+
+        eui64 = ip6_daddr->s6_addr + 8;
+
+        addr->b[0] = eui64[7];
+        addr->b[1] = eui64[6];
+        addr->b[2] = eui64[5];
+        addr->b[3] = eui64[2];
+        addr->b[4] = eui64[1];
+        addr->b[5] = eui64[0];
+
+        addr->b[5] ^= 2;
+
+        /* Set universal/local bit to 0 */
+        if (addr->b[5] & 1) {
+                addr->b[5] &= ~1;
+                *addr_type = ADDR_LE_DEV_PUBLIC;
+        } else {
+                *addr_type = ADDR_LE_DEV_RANDOM;
+        }
+}
+
+static int header_create(struct sk_buff *skb, struct net_device *netdev,
+                         unsigned short type, const void *_daddr,
+                         const void *_saddr, unsigned int len)
+{
+        struct ipv6hdr *hdr;
+        struct lowpan_dev *dev;
+        struct lowpan_peer *peer;
+        bdaddr_t addr, *any = BDADDR_ANY;
+        u8 *saddr, *daddr = any->b;
+        u8 addr_type;
+
+        if (type != ETH_P_IPV6)
+                return -EINVAL;
+
+        hdr = ipv6_hdr(skb);
+
+        dev = lowpan_dev(netdev);
+
+        if (ipv6_addr_is_multicast(&hdr->daddr)) {
+                memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
+                       sizeof(struct in6_addr));
+                lowpan_cb(skb)->conn = NULL;
+        } else {
+                unsigned long flags;
+
+                /* Get destination BT device from skb.
+                 * If there is no such peer then discard the packet.
+                 */
+                get_dest_bdaddr(&hdr->daddr, &addr, &addr_type);
+
+                BT_DBG("dest addr %pMR type %d", &addr, addr_type);
+
+                read_lock_irqsave(&devices_lock, flags);
+                peer = peer_lookup_ba(dev, &addr, addr_type);
+                read_unlock_irqrestore(&devices_lock, flags);
+
+                if (!peer) {
+                        BT_DBG("no such peer %pMR found", &addr);
+                        return -ENOENT;
+                }
+
+                daddr = peer->eui64_addr;
+
+                memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
+                       sizeof(struct in6_addr));
+                lowpan_cb(skb)->conn = peer->conn;
+        }
+
+        saddr = dev->netdev->dev_addr;
+
+        return lowpan_header_compress(skb, netdev, type, daddr, saddr, len);
+}
+
+/* Packet to BT LE device */
+static int send_pkt(struct l2cap_conn *conn, const void *saddr,
+                    const void *daddr, struct sk_buff *skb,
+                    struct net_device *netdev)
+{
+        raw_dump_table(__func__, "raw skb data dump before fragmentation",
+                       skb->data, skb->len);
+
+        return conn_send(conn, skb->data, skb->len, 0, netdev);
+}
+
+static void send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct sk_buff *local_skb;
+        struct lowpan_dev *entry, *tmp;
+        unsigned long flags;
+
+        read_lock_irqsave(&devices_lock, flags);
+
+        list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+                struct lowpan_peer *pentry, *ptmp;
+                struct lowpan_dev *dev;
+
+                if (entry->netdev != netdev)
+                        continue;
+
+                dev = lowpan_dev(entry->netdev);
+
+                list_for_each_entry_safe(pentry, ptmp, &dev->peers, list) {
+                        local_skb = skb_clone(skb, GFP_ATOMIC);
+
+                        send_pkt(pentry->conn, netdev->dev_addr,
+                                 pentry->eui64_addr, local_skb, netdev);
+
+                        kfree_skb(local_skb);
+                }
+        }
+
+        read_unlock_irqrestore(&devices_lock, flags);
+}
+
+static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        int err = 0;
+        unsigned char *eui64_addr;
+        struct lowpan_dev *dev;
+        struct lowpan_peer *peer;
+        bdaddr_t addr;
+        u8 addr_type;
+
+        if (ipv6_addr_is_multicast(&lowpan_cb(skb)->addr)) {
+                /* We need to send the packet to every device
+                 * behind this interface.
+                 */
+                send_mcast_pkt(skb, netdev);
+        } else {
+                unsigned long flags;
+
+                get_dest_bdaddr(&lowpan_cb(skb)->addr, &addr, &addr_type);
+                eui64_addr = lowpan_cb(skb)->addr.s6_addr + 8;
+                dev = lowpan_dev(netdev);
+
+                read_lock_irqsave(&devices_lock, flags);
+                peer = peer_lookup_ba(dev, &addr, addr_type);
+                read_unlock_irqrestore(&devices_lock, flags);
+
+                BT_DBG("xmit from %s to %pMR (%pI6c) peer %p", netdev->name,
+                       &addr, &lowpan_cb(skb)->addr, peer);
+
+                if (peer && peer->conn)
+                        err = send_pkt(peer->conn, netdev->dev_addr,
+                                       eui64_addr, skb, netdev);
+        }
+        dev_kfree_skb(skb);
+
+        if (err)
+                BT_DBG("ERROR: xmit failed (%d)", err);
+
+        return (err < 0) ? NET_XMIT_DROP : err;
+}
+
+static const struct net_device_ops netdev_ops = {
+        .ndo_start_xmit         = bt_xmit,
+};
+
+static struct header_ops header_ops = {
+        .create = header_create,
+};
+
+static void netdev_setup(struct net_device *dev)
+{
+        dev->addr_len           = EUI64_ADDR_LEN;
+        dev->type               = ARPHRD_6LOWPAN;
+
+        dev->hard_header_len    = 0;
+        dev->needed_tailroom    = 0;
+        dev->mtu                = IPV6_MIN_MTU;
+        dev->tx_queue_len       = 0;
+        dev->flags              = IFF_RUNNING | IFF_POINTOPOINT;
+        dev->watchdog_timeo     = 0;
+
+        dev->netdev_ops         = &netdev_ops;
+        dev->header_ops         = &header_ops;
+        dev->destructor         = free_netdev;
+}
+
+static struct device_type bt_type = {
+        .name   = "bluetooth",
+};
+
+static void set_addr(u8 *eui, u8 *addr, u8 addr_type)
+{
+        /* addr is the BT address in little-endian format */
+        eui[0] = addr[5];
+        eui[1] = addr[4];
+        eui[2] = addr[3];
+        eui[3] = 0xFF;
+        eui[4] = 0xFE;
+        eui[5] = addr[2];
+        eui[6] = addr[1];
+        eui[7] = addr[0];
+
+        eui[0] ^= 2;
+
+        /* Universal/local bit set, RFC 4291 */
+        if (addr_type == ADDR_LE_DEV_PUBLIC)
+                eui[0] |= 1;
+        else
+                eui[0] &= ~1;
+}
+
+static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr,
+                         u8 addr_type)
+{
+        netdev->addr_assign_type = NET_ADDR_PERM;
+        set_addr(netdev->dev_addr, addr->b, addr_type);
+        netdev->dev_addr[0] ^= 2;
+}
+
+static void ifup(struct net_device *netdev)
+{
+        int err;
+
+        rtnl_lock();
+        err = dev_open(netdev);
+        if (err < 0)
+                BT_INFO("iface %s cannot be opened (%d)", netdev->name, err);
+        rtnl_unlock();
+}
+
+static void do_notify_peers(struct work_struct *work)
+{
+        struct lowpan_dev *dev = container_of(work, struct lowpan_dev,
+                                              notify_peers.work);
+
+        netdev_notify_peers(dev->netdev); /* send neighbour adv at startup */
+}
+
+static bool is_bt_6lowpan(struct hci_conn *hcon)
+{
+        if (hcon->type != LE_LINK)
+                return false;
+
+        return test_bit(HCI_CONN_6LOWPAN, &hcon->flags);
+}
+
+static int add_peer_conn(struct l2cap_conn *conn, struct lowpan_dev *dev)
+{
+        struct lowpan_peer *peer;
+        unsigned long flags;
+
+        peer = kzalloc(sizeof(*peer), GFP_ATOMIC);
+        if (!peer)
+                return -ENOMEM;
+
+        peer->conn = conn;
+        memset(&peer->peer_addr, 0, sizeof(struct in6_addr));
+
+        /* RFC 2464 ch. 5 */
+        peer->peer_addr.s6_addr[0] = 0xFE;
+        peer->peer_addr.s6_addr[1] = 0x80;
+        set_addr((u8 *)&peer->peer_addr.s6_addr + 8, conn->hcon->dst.b,
+                 conn->hcon->dst_type);
+
+        memcpy(&peer->eui64_addr, (u8 *)&peer->peer_addr.s6_addr + 8,
+               EUI64_ADDR_LEN);
+        peer->eui64_addr[0] ^= 2; /* second bit-flip (Universe/Local)
+                                   * is done according RFC2464
+                                   */
+
+        raw_dump_inline(__func__, "peer IPv6 address",
+                        (unsigned char *)&peer->peer_addr, 16);
+        raw_dump_inline(__func__, "peer EUI64 address", peer->eui64_addr, 8);
+
+        write_lock_irqsave(&devices_lock, flags);
+        INIT_LIST_HEAD(&peer->list);
+        peer_add(dev, peer);
+        write_unlock_irqrestore(&devices_lock, flags);
+
+        /* Notifying peers about us needs to be done without locks held */
+        INIT_DELAYED_WORK(&dev->notify_peers, do_notify_peers);
+        schedule_delayed_work(&dev->notify_peers, msecs_to_jiffies(100));
+
+        return 0;
+}
+
+/* This gets called when BT LE 6LoWPAN device is connected. We then
+ * create network device that acts as a proxy between BT LE device
+ * and kernel network stack.
+ */
+int bt_6lowpan_add_conn(struct l2cap_conn *conn)
+{
+        struct lowpan_peer *peer = NULL;
+        struct lowpan_dev *dev;
+        struct net_device *netdev;
+        int err = 0;
+        unsigned long flags;
+
+        if (!is_bt_6lowpan(conn->hcon))
+                return 0;
+
+        peer = lookup_peer(conn);
+        if (peer)
+                return -EEXIST;
+
+        dev = lookup_dev(conn);
+        if (dev)
+                return add_peer_conn(conn, dev);
+
+        netdev = alloc_netdev(sizeof(*dev), IFACE_NAME_TEMPLATE, netdev_setup);
+        if (!netdev)
+                return -ENOMEM;
+
+        set_dev_addr(netdev, &conn->hcon->src, conn->hcon->src_type);
+
+        netdev->netdev_ops = &netdev_ops;
+        SET_NETDEV_DEV(netdev, &conn->hcon->dev);
+        SET_NETDEV_DEVTYPE(netdev, &bt_type);
+
+        err = register_netdev(netdev);
+        if (err < 0) {
+                BT_INFO("register_netdev failed %d", err);
+                free_netdev(netdev);
+                goto out;
+        }
+
+        BT_DBG("ifindex %d peer bdaddr %pMR my addr %pMR",
+               netdev->ifindex, &conn->hcon->dst, &conn->hcon->src);
+        set_bit(__LINK_STATE_PRESENT, &netdev->state);
+
+        dev = netdev_priv(netdev);
+        dev->netdev = netdev;
+        dev->hdev = conn->hcon->hdev;
+        INIT_LIST_HEAD(&dev->peers);
+
+        write_lock_irqsave(&devices_lock, flags);
+        INIT_LIST_HEAD(&dev->list);
+        list_add(&dev->list, &bt_6lowpan_devices);
+        write_unlock_irqrestore(&devices_lock, flags);
+
+        ifup(netdev);
+
+        return add_peer_conn(conn, dev);
+
+out:
+        return err;
+}
+
+static void delete_netdev(struct work_struct *work)
+{
+        struct lowpan_dev *entry = container_of(work, struct lowpan_dev,
+                                                delete_netdev);
+
+        unregister_netdev(entry->netdev);
+
+        /* The entry pointer is deleted in device_event() */
+}
+
+int bt_6lowpan_del_conn(struct l2cap_conn *conn)
+{
+        struct lowpan_dev *entry, *tmp;
+        struct lowpan_dev *dev = NULL;
+        struct lowpan_peer *peer;
+        int err = -ENOENT;
+        unsigned long flags;
+        bool last = false;
+
+        if (!conn || !is_bt_6lowpan(conn->hcon))
+                return 0;
+
+        write_lock_irqsave(&devices_lock, flags);
+
+        list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+                dev = lowpan_dev(entry->netdev);
+                peer = peer_lookup_conn(dev, conn);
+                if (peer) {
+                        last = peer_del(dev, peer);
+                        err = 0;
+                        break;
+                }
+        }
+
+        if (!err && last && dev && !atomic_read(&dev->peer_count)) {
+                write_unlock_irqrestore(&devices_lock, flags);
+
+                cancel_delayed_work_sync(&dev->notify_peers);
+
+                /* bt_6lowpan_del_conn() is called with hci dev lock held which
+                 * means that we must delete the netdevice in worker thread.
+                 */
+                INIT_WORK(&entry->delete_netdev, delete_netdev);
+                schedule_work(&entry->delete_netdev);
+        } else {
+                write_unlock_irqrestore(&devices_lock, flags);
+        }
+
+        return err;
+}
+
+static int device_event(struct notifier_block *unused,
+                        unsigned long event, void *ptr)
+{
+        struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
+        struct lowpan_dev *entry, *tmp;
+        unsigned long flags;
+
+        if (netdev->type != ARPHRD_6LOWPAN)
+                return NOTIFY_DONE;
+
+        switch (event) {
+        case NETDEV_UNREGISTER:
+                write_lock_irqsave(&devices_lock, flags);
+                list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices,
+                                         list) {
+                        if (entry->netdev == netdev) {
+                                list_del(&entry->list);
+                                kfree(entry);
+                                break;
+                        }
+                }
+                write_unlock_irqrestore(&devices_lock, flags);
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block bt_6lowpan_dev_notifier = {
+        .notifier_call = device_event,
+};
+
+int bt_6lowpan_init(void)
+{
+        return register_netdevice_notifier(&bt_6lowpan_dev_notifier);
+}
+
+void bt_6lowpan_cleanup(void)
+{
+        unregister_netdevice_notifier(&bt_6lowpan_dev_notifier);
+}
diff --git a/net/bluetooth/6lowpan.h b/net/bluetooth/6lowpan.h
new file mode 100644
index 000000000000..680eac808d74
--- /dev/null
+++ b/net/bluetooth/6lowpan.h
@@ -0,0 +1,26 @@
+/*
+   Copyright (c) 2013 Intel Corp.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 and
+   only version 2 as published by the Free Software Foundation.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+*/
+
+#ifndef __6LOWPAN_H
+#define __6LOWPAN_H
+
+#include <linux/skbuff.h>
+#include <net/bluetooth/l2cap.h>
+
+int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb);
+int bt_6lowpan_add_conn(struct l2cap_conn *conn);
+int bt_6lowpan_del_conn(struct l2cap_conn *conn);
+int bt_6lowpan_init(void);
+void bt_6lowpan_cleanup(void);
+
+#endif /* __6LOWPAN_H */
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 6a791e73e39d..cc6827e2ce68 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -10,6 +10,10 @@ obj-$(CONFIG_BT_HIDP)	+= hidp/
 
 bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
         hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
-        a2mp.o amp.o
+        a2mp.o amp.o 6lowpan.o
+
+ifeq ($(CONFIG_IEEE802154_6LOWPAN),)
+  bluetooth-y +=  ../ieee802154/6lowpan_iphc.o
+endif
 
 subdir-ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8b8b5f80dd89..5e8663c194c1 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -636,6 +636,49 @@ static int conn_max_interval_get(void *data, u64 *val)
 DEFINE_SIMPLE_ATTRIBUTE(conn_max_interval_fops, conn_max_interval_get,
                         conn_max_interval_set, "%llu\n");
 
+static ssize_t lowpan_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct hci_dev *hdev = file->private_data;
+        char buf[3];
+
+        buf[0] = test_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags) ? 'Y' : 'N';
+        buf[1] = '\n';
+        buf[2] = '\0';
+        return simple_read_from_buffer(user_buf, count, ppos, buf, 2);
+}
+
+static ssize_t lowpan_write(struct file *fp, const char __user *user_buffer,
+                            size_t count, loff_t *position)
+{
+        struct hci_dev *hdev = fp->private_data;
+        bool enable;
+        char buf[32];
+        size_t buf_size = min(count, (sizeof(buf)-1));
+
+        if (copy_from_user(buf, user_buffer, buf_size))
+                return -EFAULT;
+
+        buf[buf_size] = '\0';
+
+        if (strtobool(buf, &enable) < 0)
+                return -EINVAL;
+
+        if (enable == test_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags))
+                return -EALREADY;
+
+        change_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags);
+
+        return count;
+}
+
+static const struct file_operations lowpan_debugfs_fops = {
+        .open           = simple_open,
+        .read           = lowpan_read,
+        .write          = lowpan_write,
+        .llseek         = default_llseek,
+};
+
 /* ---- HCI requests ---- */
 
 static void hci_req_sync_complete(struct hci_dev *hdev, u8 result)
@@ -1261,8 +1304,13 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt)
          * as supported send it. If not supported assume that the controller
          * does not have actual support for stored link keys which makes this
          * command redundant anyway.
+         *
+         * Some controllers indicate that they support handling deleting
+         * stored link keys, but they don't. The quirk lets a driver
+         * just disable this command.
          */
-        if (hdev->commands[6] & 0x80) {
+        if (hdev->commands[6] & 0x80 &&
+            !test_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks)) {
                 struct hci_cp_delete_stored_link_key cp;
 
                 bacpy(&cp.bdaddr, BDADDR_ANY);
@@ -1406,6 +1454,8 @@ static int __hci_init(struct hci_dev *hdev)
                                     hdev, &conn_min_interval_fops);
                 debugfs_create_file("conn_max_interval", 0644, hdev->debugfs,
                                     hdev, &conn_max_interval_fops);
+                debugfs_create_file("6lowpan", 0644, hdev->debugfs, hdev,
+                                    &lowpan_debugfs_fops);
         }
 
         return 0;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5fb3df66c2cd..5f812455a450 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3533,6 +3533,9 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
         conn->handle = __le16_to_cpu(ev->handle);
         conn->state = BT_CONNECTED;
 
+        if (test_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags))
+                set_bit(HCI_CONN_6LOWPAN, &conn->flags);
+
         hci_conn_add_sysfs(conn);
 
         hci_proto_connect_cfm(conn, ev->status);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b6bca64b320d..b0ad2c752d73 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -40,6 +40,7 @@
 #include "smp.h"
 #include "a2mp.h"
 #include "amp.h"
+#include "6lowpan.h"
 
 bool disable_ertm;
 
@@ -1468,6 +1469,8 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 
         BT_DBG("");
 
+        bt_6lowpan_add_conn(conn);
+
         /* Check if we have socket listening on cid */
         pchan = l2cap_global_chan_by_scid(BT_LISTEN, L2CAP_CID_ATT,
                                           &hcon->src, &hcon->dst);
@@ -7119,6 +7122,10 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
                         l2cap_conn_del(conn->hcon, EACCES);
                 break;
 
+        case L2CAP_FC_6LOWPAN:
+                bt_6lowpan_recv(conn, skb);
+                break;
+
         default:
                 l2cap_data_channel(conn, cid, skb);
                 break;
@@ -7186,6 +7193,8 @@ void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
 {
         BT_DBG("hcon %p reason %d", hcon, reason);
 
+        bt_6lowpan_del_conn(hcon->l2cap_data);
+
         l2cap_conn_del(hcon, bt_to_errno(reason));
 }
 
@@ -7467,11 +7476,14 @@ int __init l2cap_init(void)
         debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs,
                            &le_default_mps);
 
+        bt_6lowpan_init();
+
         return 0;
 }
 
 void l2cap_exit(void)
 {
+        bt_6lowpan_cleanup();
         debugfs_remove(l2cap_debugfs);
         l2cap_cleanup_sockets();
 }
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index e7806e6d282c..20ef748b2906 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -147,6 +147,9 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                     __le16_to_cpu(la.l2_psm) == L2CAP_PSM_RFCOMM)
                         chan->sec_level = BT_SECURITY_SDP;
                 break;
+        case L2CAP_CHAN_RAW:
+                chan->sec_level = BT_SECURITY_SDP;
+                break;
         }
 
         bacpy(&chan->src, &la.l2_bdaddr);
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 84fcf9fff3ea..f9c0980abeea 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -58,6 +58,7 @@ struct rfcomm_dev {
         uint                    modem_status;
 
         struct rfcomm_dlc       *dlc;
+        wait_queue_head_t       conn_wait;
 
         struct device           *tty_dev;
 
@@ -103,20 +104,60 @@ static void rfcomm_dev_destruct(struct tty_port *port)
         module_put(THIS_MODULE);
 }
 
-/* device-specific initialization: open the dlc */
-static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty)
+static struct device *rfcomm_get_device(struct rfcomm_dev *dev)
 {
-        struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);
+        struct hci_dev *hdev;
+        struct hci_conn *conn;
 
-        return rfcomm_dlc_open(dev->dlc, &dev->src, &dev->dst, dev->channel);
+        hdev = hci_get_route(&dev->dst, &dev->src);
+        if (!hdev)
+                return NULL;
+
+        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);
+
+        hci_dev_put(hdev);
+
+        return conn ? &conn->dev : NULL;
 }
 
-/* we block the open until the dlc->state becomes BT_CONNECTED */
-static int rfcomm_dev_carrier_raised(struct tty_port *port)
+/* device-specific initialization: open the dlc */
+static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty)
 {
         struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);
+        DEFINE_WAIT(wait);
+        int err;
+
+        err = rfcomm_dlc_open(dev->dlc, &dev->src, &dev->dst, dev->channel);
+        if (err)
+                return err;
+
+        while (1) {
+                prepare_to_wait(&dev->conn_wait, &wait, TASK_INTERRUPTIBLE);
+
+                if (dev->dlc->state == BT_CLOSED) {
+                        err = -dev->err;
+                        break;
+                }
+
+                if (dev->dlc->state == BT_CONNECTED)
+                        break;
+
+                if (signal_pending(current)) {
+                        err = -ERESTARTSYS;
+                        break;
+                }
+
+                tty_unlock(tty);
+                schedule();
+                tty_lock(tty);
+        }
+        finish_wait(&dev->conn_wait, &wait);
+
+        if (!err)
+                device_move(dev->tty_dev, rfcomm_get_device(dev),
+                            DPM_ORDER_DEV_AFTER_PARENT);
 
-        return (dev->dlc->state == BT_CONNECTED);
+        return err;
 }
 
 /* device-specific cleanup: close the dlc */
@@ -135,7 +176,6 @@ static const struct tty_port_operations rfcomm_port_ops = {
         .destruct = rfcomm_dev_destruct,
         .activate = rfcomm_dev_activate,
         .shutdown = rfcomm_dev_shutdown,
-        .carrier_raised = rfcomm_dev_carrier_raised,
 };
 
 static struct rfcomm_dev *__rfcomm_dev_get(int id)
@@ -169,22 +209,6 @@ static struct rfcomm_dev *rfcomm_dev_get(int id)
         return dev;
 }
 
-static struct device *rfcomm_get_device(struct rfcomm_dev *dev)
-{
-        struct hci_dev *hdev;
-        struct hci_conn *conn;
-
-        hdev = hci_get_route(&dev->dst, &dev->src);
-        if (!hdev)
-                return NULL;
-
-        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);
-
-        hci_dev_put(hdev);
-
-        return conn ? &conn->dev : NULL;
-}
-
 static ssize_t show_address(struct device *tty_dev, struct device_attribute *attr, char *buf)
 {
         struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
@@ -258,6 +282,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 
         tty_port_init(&dev->port);
         dev->port.ops = &rfcomm_port_ops;
+        init_waitqueue_head(&dev->conn_wait);
 
         skb_queue_head_init(&dev->pending);
 
@@ -437,7 +462,8 @@ static int rfcomm_release_dev(void __user *arg)
                 tty_kref_put(tty);
         }
 
-        if (!test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags))
+        if (!test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags) &&
+            !test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags))
                 tty_port_put(&dev->port);
 
         tty_port_put(&dev->port);
@@ -575,12 +601,9 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
         BT_DBG("dlc %p dev %p err %d", dlc, dev, err);
 
         dev->err = err;
-        if (dlc->state == BT_CONNECTED) {
-                device_move(dev->tty_dev, rfcomm_get_device(dev),
-                            DPM_ORDER_DEV_AFTER_PARENT);
+        wake_up_interruptible(&dev->conn_wait);
 
-                wake_up_interruptible(&dev->port.open_wait);
-        } else if (dlc->state == BT_CLOSED)
+        if (dlc->state == BT_CLOSED)
                 tty_port_tty_hangup(&dev->port, false);
 }
 
@@ -670,10 +693,20 @@ static int rfcomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 
         /* install the tty_port */
         err = tty_port_install(&dev->port, driver, tty);
-        if (err)
+        if (err) {
                 rfcomm_tty_cleanup(tty);
+                return err;
+        }
 
-        return err;
+        /* take over the tty_port reference if the port was created with the
+         * flag RFCOMM_RELEASE_ONHUP. This will force the release of the port
+         * when the last process closes the tty. The behaviour is expected by
+         * userspace.
+         */
+        if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags))
+                tty_port_put(&dev->port);
+
+        return 0;
 }
 
 static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
@@ -1010,10 +1043,6 @@ static void rfcomm_tty_hangup(struct tty_struct *tty)
         BT_DBG("tty %p dev %p", tty, dev);
 
         tty_port_hangup(&dev->port);
-
-        if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags) &&
-            !test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags))
-                tty_port_put(&dev->port);
 }
 
 static int rfcomm_tty_tiocmget(struct tty_struct *tty)
@@ -1096,7 +1125,7 @@ int __init rfcomm_init_ttys(void)
         rfcomm_tty_driver->subtype      = SERIAL_TYPE_NORMAL;
         rfcomm_tty_driver->flags        = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         rfcomm_tty_driver->init_termios = tty_std_termios;
-        rfcomm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL;
+        rfcomm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         rfcomm_tty_driver->init_termios.c_lflag &= ~ICANON;
         tty_set_operations(rfcomm_tty_driver, &rfcomm_ops);
 
diff --git a/net/bridge/netfilter/nf_tables_bridge.c b/net/bridge/netfilter/nf_tables_bridge.c
index cf54b22818c8..5bcc0d8b31f2 100644
--- a/net/bridge/netfilter/nf_tables_bridge.c
+++ b/net/bridge/netfilter/nf_tables_bridge.c
@@ -14,10 +14,30 @@
 #include <linux/netfilter_bridge.h>
 #include <net/netfilter/nf_tables.h>
 
+static unsigned int
+nft_do_chain_bridge(const struct nf_hook_ops *ops,
+                    struct sk_buff *skb,
+                    const struct net_device *in,
+                    const struct net_device *out,
+                    int (*okfn)(struct sk_buff *))
+{
+        struct nft_pktinfo pkt;
+
+        nft_set_pktinfo(&pkt, ops, skb, in, out);
+
+        return nft_do_chain(&pkt, ops);
+}
+
 static struct nft_af_info nft_af_bridge __read_mostly = {
         .family         = NFPROTO_BRIDGE,
         .nhooks         = NF_BR_NUMHOOKS,
         .owner          = THIS_MODULE,
+        .nops           = 1,
+        .hooks          = {
+                [NF_BR_LOCAL_IN]        = nft_do_chain_bridge,
+                [NF_BR_FORWARD]         = nft_do_chain_bridge,
+                [NF_BR_LOCAL_OUT]       = nft_do_chain_bridge,
+        },
 };
 
 static int nf_tables_bridge_init_net(struct net *net)
@@ -48,32 +68,14 @@ static struct pernet_operations nf_tables_bridge_net_ops = {
         .exit   = nf_tables_bridge_exit_net,
 };
 
-static unsigned int
-nft_do_chain_bridge(const struct nf_hook_ops *ops,
-                    struct sk_buff *skb,
-                    const struct net_device *in,
-                    const struct net_device *out,
-                    int (*okfn)(struct sk_buff *))
-{
-        struct nft_pktinfo pkt;
-
-        nft_set_pktinfo(&pkt, ops, skb, in, out);
-
-        return nft_do_chain_pktinfo(&pkt, ops);
-}
-
-static struct nf_chain_type filter_bridge = {
-        .family         = NFPROTO_BRIDGE,
+static const struct nf_chain_type filter_bridge = {
         .name           = "filter",
         .type           = NFT_CHAIN_T_DEFAULT,
+        .family         = NFPROTO_BRIDGE,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_BR_LOCAL_IN) |
                           (1 << NF_BR_FORWARD) |
                           (1 << NF_BR_LOCAL_OUT),
-        .fn             = {
-                [NF_BR_LOCAL_IN]        = nft_do_chain_bridge,
-                [NF_BR_FORWARD]         = nft_do_chain_bridge,
-                [NF_BR_LOCAL_OUT]       = nft_do_chain_bridge,
-        },
 };
 
 static int __init nf_tables_bridge_init(void)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index a2d2456a557a..48b25c0af4d0 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -62,9 +62,6 @@
 
 #include "6lowpan.h"
 
-/* TTL uncompression values */
-static const u8 lowpan_ttl_values[] = {0, 1, 64, 255};
-
 static LIST_HEAD(lowpan_devices);
 
 /* private device info */
@@ -104,378 +101,14 @@ static inline void lowpan_address_flip(u8 *src, u8 *dest)
                 (dest)[IEEE802154_ADDR_LEN - i - 1] = (src)[i];
 }
 
-/* list of all 6lowpan devices, uses for package delivering */
-/* print data in line */
-static inline void lowpan_raw_dump_inline(const char *caller, char *msg,
-                                   unsigned char *buf, int len)
-{
-#ifdef DEBUG
-        if (msg)
-                pr_debug("(%s) %s: ", caller, msg);
-        print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE,
-                       16, 1, buf, len, false);
-#endif /* DEBUG */
-}
-
-/*
- * print data in a table format:
- *
- * addr: xx xx xx xx xx xx
- * addr: xx xx xx xx xx xx
- * ...
- */
-static inline void lowpan_raw_dump_table(const char *caller, char *msg,
-                                   unsigned char *buf, int len)
-{
-#ifdef DEBUG
-        if (msg)
-                pr_debug("(%s) %s:\n", caller, msg);
-        print_hex_dump(KERN_DEBUG, "\t", DUMP_PREFIX_OFFSET,
-                       16, 1, buf, len, false);
-#endif /* DEBUG */
-}
-
-static u8
-lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift, const struct in6_addr *ipaddr,
-                 const unsigned char *lladdr)
-{
-        u8 val = 0;
-
-        if (is_addr_mac_addr_based(ipaddr, lladdr))
-                val = 3; /* 0-bits */
-        else if (lowpan_is_iid_16_bit_compressable(ipaddr)) {
-                /* compress IID to 16 bits xxxx::XXXX */
-                memcpy(*hc06_ptr, &ipaddr->s6_addr16[7], 2);
-                *hc06_ptr += 2;
-                val = 2; /* 16-bits */
-        } else {
-                /* do not compress IID => xxxx::IID */
-                memcpy(*hc06_ptr, &ipaddr->s6_addr16[4], 8);
-                *hc06_ptr += 8;
-                val = 1; /* 64-bits */
-        }
-
-        return rol8(val, shift);
-}
-
-/*
- * Uncompress address function for source and
- * destination address(non-multicast).
- *
- * address_mode is sam value or dam value.
- */
-static int
-lowpan_uncompress_addr(struct sk_buff *skb,
-                struct in6_addr *ipaddr,
-                const u8 address_mode,
-                const struct ieee802154_addr *lladdr)
-{
-        bool fail;
-
-        switch (address_mode) {
-        case LOWPAN_IPHC_ADDR_00:
-                /* for global link addresses */
-                fail = lowpan_fetch_skb(skb, ipaddr->s6_addr, 16);
-                break;
-        case LOWPAN_IPHC_ADDR_01:
-                /* fe:80::XXXX:XXXX:XXXX:XXXX */
-                ipaddr->s6_addr[0] = 0xFE;
-                ipaddr->s6_addr[1] = 0x80;
-                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[8], 8);
-                break;
-        case LOWPAN_IPHC_ADDR_02:
-                /* fe:80::ff:fe00:XXXX */
-                ipaddr->s6_addr[0] = 0xFE;
-                ipaddr->s6_addr[1] = 0x80;
-                ipaddr->s6_addr[11] = 0xFF;
-                ipaddr->s6_addr[12] = 0xFE;
-                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[14], 2);
-                break;
-        case LOWPAN_IPHC_ADDR_03:
-                fail = false;
-                switch (lladdr->addr_type) {
-                case IEEE802154_ADDR_LONG:
-                        /* fe:80::XXXX:XXXX:XXXX:XXXX
-                         *        \_________________/
-                         *              hwaddr
-                         */
-                        ipaddr->s6_addr[0] = 0xFE;
-                        ipaddr->s6_addr[1] = 0x80;
-                        memcpy(&ipaddr->s6_addr[8], lladdr->hwaddr,
-                                        IEEE802154_ADDR_LEN);
-                        /* second bit-flip (Universe/Local)
-                         * is done according RFC2464
-                         */
-                        ipaddr->s6_addr[8] ^= 0x02;
-                        break;
-                case IEEE802154_ADDR_SHORT:
-                        /* fe:80::ff:fe00:XXXX
-                         *                \__/
-                         *             short_addr
-                         *
-                         * Universe/Local bit is zero.
-                         */
-                        ipaddr->s6_addr[0] = 0xFE;
-                        ipaddr->s6_addr[1] = 0x80;
-                        ipaddr->s6_addr[11] = 0xFF;
-                        ipaddr->s6_addr[12] = 0xFE;
-                        ipaddr->s6_addr16[7] = htons(lladdr->short_addr);
-                        break;
-                default:
-                        pr_debug("Invalid addr_type set\n");
-                        return -EINVAL;
-                }
-                break;
-        default:
-                pr_debug("Invalid address mode value: 0x%x\n", address_mode);
-                return -EINVAL;
-        }
-
-        if (fail) {
-                pr_debug("Failed to fetch skb data\n");
-                return -EIO;
-        }
-
-        lowpan_raw_dump_inline(NULL, "Reconstructed ipv6 addr is:\n",
-                        ipaddr->s6_addr, 16);
-
-        return 0;
-}
-
-/* Uncompress address function for source context
- * based address(non-multicast).
- */
-static int
-lowpan_uncompress_context_based_src_addr(struct sk_buff *skb,
-                struct in6_addr *ipaddr,
-                const u8 sam)
-{
-        switch (sam) {
-        case LOWPAN_IPHC_ADDR_00:
-                /* unspec address ::
-                 * Do nothing, address is already ::
-                 */
-                break;
-        case LOWPAN_IPHC_ADDR_01:
-                /* TODO */
-        case LOWPAN_IPHC_ADDR_02:
-                /* TODO */
-        case LOWPAN_IPHC_ADDR_03:
-                /* TODO */
-                netdev_warn(skb->dev, "SAM value 0x%x not supported\n", sam);
-                return -EINVAL;
-        default:
-                pr_debug("Invalid sam value: 0x%x\n", sam);
-                return -EINVAL;
-        }
-
-        lowpan_raw_dump_inline(NULL,
-                        "Reconstructed context based ipv6 src addr is:\n",
-                        ipaddr->s6_addr, 16);
-
-        return 0;
-}
-
-/* Uncompress function for multicast destination address,
- * when M bit is set.
- */
-static int
-lowpan_uncompress_multicast_daddr(struct sk_buff *skb,
-                struct in6_addr *ipaddr,
-                const u8 dam)
-{
-        bool fail;
-
-        switch (dam) {
-        case LOWPAN_IPHC_DAM_00:
-                /* 00:  128 bits.  The full address
-                 * is carried in-line.
-                 */
-                fail = lowpan_fetch_skb(skb, ipaddr->s6_addr, 16);
-                break;
-        case LOWPAN_IPHC_DAM_01:
-                /* 01:  48 bits.  The address takes
-                 * the form ffXX::00XX:XXXX:XXXX.
-                 */
-                ipaddr->s6_addr[0] = 0xFF;
-                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[1], 1);
-                fail |= lowpan_fetch_skb(skb, &ipaddr->s6_addr[11], 5);
-                break;
-        case LOWPAN_IPHC_DAM_10:
-                /* 10:  32 bits.  The address takes
-                 * the form ffXX::00XX:XXXX.
-                 */
-                ipaddr->s6_addr[0] = 0xFF;
-                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[1], 1);
-                fail |= lowpan_fetch_skb(skb, &ipaddr->s6_addr[13], 3);
-                break;
-        case LOWPAN_IPHC_DAM_11:
-                /* 11:  8 bits.  The address takes
-                 * the form ff02::00XX.
-                 */
-                ipaddr->s6_addr[0] = 0xFF;
-                ipaddr->s6_addr[1] = 0x02;
-                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[15], 1);
-                break;
-        default:
-                pr_debug("DAM value has a wrong value: 0x%x\n", dam);
-                return -EINVAL;
-        }
-
-        if (fail) {
-                pr_debug("Failed to fetch skb data\n");
-                return -EIO;
-        }
-
-        lowpan_raw_dump_inline(NULL, "Reconstructed ipv6 multicast addr is:\n",
-                        ipaddr->s6_addr, 16);
-
-        return 0;
-}
-
-static void
-lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
-{
-        struct udphdr *uh = udp_hdr(skb);
-
-        if (((uh->source & LOWPAN_NHC_UDP_4BIT_MASK) ==
-                                LOWPAN_NHC_UDP_4BIT_PORT) &&
-            ((uh->dest & LOWPAN_NHC_UDP_4BIT_MASK) ==
-                                LOWPAN_NHC_UDP_4BIT_PORT)) {
-                pr_debug("UDP header: both ports compression to 4 bits\n");
-                **hc06_ptr = LOWPAN_NHC_UDP_CS_P_11;
-                **(hc06_ptr + 1) = /* subtraction is faster */
-                   (u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) +
-                       ((uh->source & LOWPAN_NHC_UDP_4BIT_PORT) << 4));
-                *hc06_ptr += 2;
-        } else if ((uh->dest & LOWPAN_NHC_UDP_8BIT_MASK) ==
-                        LOWPAN_NHC_UDP_8BIT_PORT) {
-                pr_debug("UDP header: remove 8 bits of dest\n");
-                **hc06_ptr = LOWPAN_NHC_UDP_CS_P_01;
-                memcpy(*hc06_ptr + 1, &uh->source, 2);
-                **(hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
-                *hc06_ptr += 4;
-        } else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) ==
-                        LOWPAN_NHC_UDP_8BIT_PORT) {
-                pr_debug("UDP header: remove 8 bits of source\n");
-                **hc06_ptr = LOWPAN_NHC_UDP_CS_P_10;
-                memcpy(*hc06_ptr + 1, &uh->dest, 2);
-                **(hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
-                *hc06_ptr += 4;
-        } else {
-                pr_debug("UDP header: can't compress\n");
-                **hc06_ptr = LOWPAN_NHC_UDP_CS_P_00;
-                memcpy(*hc06_ptr + 1, &uh->source, 2);
-                memcpy(*hc06_ptr + 3, &uh->dest, 2);
-                *hc06_ptr += 5;
-        }
-
-        /* checksum is always inline */
-        memcpy(*hc06_ptr, &uh->check, 2);
-        *hc06_ptr += 2;
-
-        /* skip the UDP header */
-        skb_pull(skb, sizeof(struct udphdr));
-}
-
-static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
-{
-        if (unlikely(!pskb_may_pull(skb, 1)))
-                return -EINVAL;
-
-        *val = skb->data[0];
-        skb_pull(skb, 1);
-
-        return 0;
-}
-
-static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
-{
-        if (unlikely(!pskb_may_pull(skb, 2)))
-                return -EINVAL;
-
-        *val = (skb->data[0] << 8) | skb->data[1];
-        skb_pull(skb, 2);
-
-        return 0;
-}
-
-static int
-lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)
-{
-        u8 tmp;
-
-        if (!uh)
-                goto err;
-
-        if (lowpan_fetch_skb_u8(skb, &tmp))
-                goto err;
-
-        if ((tmp & LOWPAN_NHC_UDP_MASK) == LOWPAN_NHC_UDP_ID) {
-                pr_debug("UDP header uncompression\n");
-                switch (tmp & LOWPAN_NHC_UDP_CS_P_11) {
-                case LOWPAN_NHC_UDP_CS_P_00:
-                        memcpy(&uh->source, &skb->data[0], 2);
-                        memcpy(&uh->dest, &skb->data[2], 2);
-                        skb_pull(skb, 4);
-                        break;
-                case LOWPAN_NHC_UDP_CS_P_01:
-                        memcpy(&uh->source, &skb->data[0], 2);
-                        uh->dest =
-                           skb->data[2] + LOWPAN_NHC_UDP_8BIT_PORT;
-                        skb_pull(skb, 3);
-                        break;
-                case LOWPAN_NHC_UDP_CS_P_10:
-                        uh->source = skb->data[0] + LOWPAN_NHC_UDP_8BIT_PORT;
-                        memcpy(&uh->dest, &skb->data[1], 2);
-                        skb_pull(skb, 3);
-                        break;
-                case LOWPAN_NHC_UDP_CS_P_11:
-                        uh->source =
-                           LOWPAN_NHC_UDP_4BIT_PORT + (skb->data[0] >> 4);
-                        uh->dest =
-                           LOWPAN_NHC_UDP_4BIT_PORT + (skb->data[0] & 0x0f);
-                        skb_pull(skb, 1);
-                        break;
-                default:
-                        pr_debug("ERROR: unknown UDP format\n");
-                        goto err;
-                }
-
-                pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
-                         uh->source, uh->dest);
-
-                /* copy checksum */
-                memcpy(&uh->check, &skb->data[0], 2);
-                skb_pull(skb, 2);
-
-                /*
-                 * UDP lenght needs to be infered from the lower layers
-                 * here, we obtain the hint from the remaining size of the
-                 * frame
-                 */
-                uh->len = htons(skb->len + sizeof(struct udphdr));
-                pr_debug("uncompressed UDP length: src = %d", uh->len);
-        } else {
-                pr_debug("ERROR: unsupported NH format\n");
-                goto err;
-        }
-
-        return 0;
-err:
-        return -EINVAL;
-}
-
 static int lowpan_header_create(struct sk_buff *skb,
                            struct net_device *dev,
                            unsigned short type, const void *_daddr,
                            const void *_saddr, unsigned int len)
 {
-        u8 tmp, iphc0, iphc1, *hc06_ptr;
         struct ipv6hdr *hdr;
         const u8 *saddr = _saddr;
         const u8 *daddr = _daddr;
-        u8 head[100];
         struct ieee802154_addr sa, da;
 
         /* TODO:
@@ -485,181 +118,14 @@ static int lowpan_header_create(struct sk_buff *skb,
                 return 0;
 
         hdr = ipv6_hdr(skb);
-        hc06_ptr = head + 2;
-
-        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n"
-                 "\tnexthdr = 0x%02x\n\thop_lim = %d\n", hdr->version,
-                 ntohs(hdr->payload_len), hdr->nexthdr, hdr->hop_limit);
-
-        lowpan_raw_dump_table(__func__, "raw skb network header dump",
-                skb_network_header(skb), sizeof(struct ipv6hdr));
 
         if (!saddr)
                 saddr = dev->dev_addr;
 
-        lowpan_raw_dump_inline(__func__, "saddr", (unsigned char *)saddr, 8);
-
-        /*
-         * As we copy some bit-length fields, in the IPHC encoding bytes,
-         * we sometimes use |=
-         * If the field is 0, and the current bit value in memory is 1,
-         * this does not work. We therefore reset the IPHC encoding here
-         */
-        iphc0 = LOWPAN_DISPATCH_IPHC;
-        iphc1 = 0;
-
-        /* TODO: context lookup */
+        raw_dump_inline(__func__, "saddr", (unsigned char *)saddr, 8);
+        raw_dump_inline(__func__, "daddr", (unsigned char *)daddr, 8);
 
-        lowpan_raw_dump_inline(__func__, "daddr", (unsigned char *)daddr, 8);
-
-        /*
-         * Traffic class, flow label
-         * If flow label is 0, compress it. If traffic class is 0, compress it
-         * We have to process both in the same time as the offset of traffic
-         * class depends on the presence of version and flow label
-         */
-
-        /* hc06 format of TC is ECN | DSCP , original one is DSCP | ECN */
-        tmp = (hdr->priority << 4) | (hdr->flow_lbl[0] >> 4);
-        tmp = ((tmp & 0x03) << 6) | (tmp >> 2);
-
-        if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
-             (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
-                /* flow label can be compressed */
-                iphc0 |= LOWPAN_IPHC_FL_C;
-                if ((hdr->priority == 0) &&
-                   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
-                        /* compress (elide) all */
-                        iphc0 |= LOWPAN_IPHC_TC_C;
-                } else {
-                        /* compress only the flow label */
-                        *hc06_ptr = tmp;
-                        hc06_ptr += 1;
-                }
-        } else {
-                /* Flow label cannot be compressed */
-                if ((hdr->priority == 0) &&
-                   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
-                        /* compress only traffic class */
-                        iphc0 |= LOWPAN_IPHC_TC_C;
-                        *hc06_ptr = (tmp & 0xc0) | (hdr->flow_lbl[0] & 0x0F);
-                        memcpy(hc06_ptr + 1, &hdr->flow_lbl[1], 2);
-                        hc06_ptr += 3;
-                } else {
-                        /* compress nothing */
-                        memcpy(hc06_ptr, hdr, 4);
-                        /* replace the top byte with new ECN | DSCP format */
-                        *hc06_ptr = tmp;
-                        hc06_ptr += 4;
-                }
-        }
-
-        /* NOTE: payload length is always compressed */
-
-        /* Next Header is compress if UDP */
-        if (hdr->nexthdr == UIP_PROTO_UDP)
-                iphc0 |= LOWPAN_IPHC_NH_C;
-
-        if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
-                *hc06_ptr = hdr->nexthdr;
-                hc06_ptr += 1;
-        }
-
-        /*
-         * Hop limit
-         * if 1:   compress, encoding is 01
-         * if 64:  compress, encoding is 10
-         * if 255: compress, encoding is 11
-         * else do not compress
-         */
-        switch (hdr->hop_limit) {
-        case 1:
-                iphc0 |= LOWPAN_IPHC_TTL_1;
-                break;
-        case 64:
-                iphc0 |= LOWPAN_IPHC_TTL_64;
-                break;
-        case 255:
-                iphc0 |= LOWPAN_IPHC_TTL_255;
-                break;
-        default:
-                *hc06_ptr = hdr->hop_limit;
-                hc06_ptr += 1;
-                break;
-        }
-
-        /* source address compression */
-        if (is_addr_unspecified(&hdr->saddr)) {
-                pr_debug("source address is unspecified, setting SAC\n");
-                iphc1 |= LOWPAN_IPHC_SAC;
-        /* TODO: context lookup */
-        } else if (is_addr_link_local(&hdr->saddr)) {
-                pr_debug("source address is link-local\n");
-                iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
-                                LOWPAN_IPHC_SAM_BIT, &hdr->saddr, saddr);
-        } else {
-                pr_debug("send the full source address\n");
-                memcpy(hc06_ptr, &hdr->saddr.s6_addr16[0], 16);
-                hc06_ptr += 16;
-        }
-
-        /* destination address compression */
-        if (is_addr_mcast(&hdr->daddr)) {
-                pr_debug("destination address is multicast: ");
-                iphc1 |= LOWPAN_IPHC_M;
-                if (lowpan_is_mcast_addr_compressable8(&hdr->daddr)) {
-                        pr_debug("compressed to 1 octet\n");
-                        iphc1 |= LOWPAN_IPHC_DAM_11;
-                        /* use last byte */
-                        *hc06_ptr = hdr->daddr.s6_addr[15];
-                        hc06_ptr += 1;
-                } else if (lowpan_is_mcast_addr_compressable32(&hdr->daddr)) {
-                        pr_debug("compressed to 4 octets\n");
-                        iphc1 |= LOWPAN_IPHC_DAM_10;
-                        /* second byte + the last three */
-                        *hc06_ptr = hdr->daddr.s6_addr[1];
-                        memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[13], 3);
-                        hc06_ptr += 4;
-                } else if (lowpan_is_mcast_addr_compressable48(&hdr->daddr)) {
-                        pr_debug("compressed to 6 octets\n");
-                        iphc1 |= LOWPAN_IPHC_DAM_01;
-                        /* second byte + the last five */
-                        *hc06_ptr = hdr->daddr.s6_addr[1];
-                        memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[11], 5);
-                        hc06_ptr += 6;
-                } else {
-                        pr_debug("using full address\n");
-                        iphc1 |= LOWPAN_IPHC_DAM_00;
-                        memcpy(hc06_ptr, &hdr->daddr.s6_addr[0], 16);
-                        hc06_ptr += 16;
-                }
-        } else {
-                /* TODO: context lookup */
-                if (is_addr_link_local(&hdr->daddr)) {
-                        pr_debug("dest address is unicast and link-local\n");
-                        iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
-                                LOWPAN_IPHC_DAM_BIT, &hdr->daddr, daddr);
-                } else {
-                        pr_debug("dest address is unicast: using full one\n");
-                        memcpy(hc06_ptr, &hdr->daddr.s6_addr16[0], 16);
-                        hc06_ptr += 16;
-                }
-        }
-
-        /* UDP header compression */
-        if (hdr->nexthdr == UIP_PROTO_UDP)
-                lowpan_compress_udp_header(&hc06_ptr, skb);
-
-        head[0] = iphc0;
-        head[1] = iphc1;
-
-        skb_pull(skb, sizeof(struct ipv6hdr));
-        skb_reset_transport_header(skb);
-        memcpy(skb_push(skb, hc06_ptr - head), head, hc06_ptr - head);
-        skb_reset_network_header(skb);
-
-        lowpan_raw_dump_table(__func__, "raw skb data dump", skb->data,
-                                skb->len);
+        lowpan_header_compress(skb, dev, type, daddr, saddr, len);
 
         /*
          * NOTE1: I'm still unsure about the fact that compression and WPAN
@@ -671,39 +137,38 @@ static int lowpan_header_create(struct sk_buff *skb,
          * from MAC subif of the 'dev' and 'real_dev' network devices, but
          * this isn't implemented in mainline yet, so currently we assign 0xff
          */
-        {
-                mac_cb(skb)->flags = IEEE802154_FC_TYPE_DATA;
-                mac_cb(skb)->seq = ieee802154_mlme_ops(dev)->get_dsn(dev);
+        mac_cb(skb)->flags = IEEE802154_FC_TYPE_DATA;
+        mac_cb(skb)->seq = ieee802154_mlme_ops(dev)->get_dsn(dev);
 
-                /* prepare wpan address data */
-                sa.addr_type = IEEE802154_ADDR_LONG;
-                sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
+        /* prepare wpan address data */
+        sa.addr_type = IEEE802154_ADDR_LONG;
+        sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
 
-                memcpy(&(sa.hwaddr), saddr, 8);
-                /* intra-PAN communications */
-                da.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
+        memcpy(&(sa.hwaddr), saddr, 8);
+        /* intra-PAN communications */
+        da.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
 
-                /*
-                 * if the destination address is the broadcast address, use the
-                 * corresponding short address
-                 */
-                if (lowpan_is_addr_broadcast(daddr)) {
-                        da.addr_type = IEEE802154_ADDR_SHORT;
-                        da.short_addr = IEEE802154_ADDR_BROADCAST;
-                } else {
-                        da.addr_type = IEEE802154_ADDR_LONG;
-                        memcpy(&(da.hwaddr), daddr, IEEE802154_ADDR_LEN);
-
-                        /* request acknowledgment */
-                        mac_cb(skb)->flags |= MAC_CB_FLAG_ACKREQ;
-                }
+        /*
+         * if the destination address is the broadcast address, use the
+         * corresponding short address
+         */
+        if (lowpan_is_addr_broadcast(daddr)) {
+                da.addr_type = IEEE802154_ADDR_SHORT;
+                da.short_addr = IEEE802154_ADDR_BROADCAST;
+        } else {
+                da.addr_type = IEEE802154_ADDR_LONG;
+                memcpy(&(da.hwaddr), daddr, IEEE802154_ADDR_LEN);
 
-                return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
-                                type, (void *)&da, (void *)&sa, skb->len);
+                /* request acknowledgment */
+                mac_cb(skb)->flags |= MAC_CB_FLAG_ACKREQ;
         }
+
+        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
+                        type, (void *)&da, (void *)&sa, skb->len);
 }
 
-static int lowpan_give_skb_to_devices(struct sk_buff *skb)
+static int lowpan_give_skb_to_devices(struct sk_buff *skb,
+                                        struct net_device *dev)
 {
         struct lowpan_dev_record *entry;
         struct sk_buff *skb_cp;
@@ -726,31 +191,6 @@ static int lowpan_give_skb_to_devices(struct sk_buff *skb)
         return stat;
 }
 
-static int lowpan_skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr)
-{
-        struct sk_buff *new;
-        int stat = NET_RX_SUCCESS;
-
-        new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb),
-                                                                GFP_ATOMIC);
-        kfree_skb(skb);
-
-        if (!new)
-                return -ENOMEM;
-
-        skb_push(new, sizeof(struct ipv6hdr));
-        skb_copy_to_linear_data(new, hdr, sizeof(struct ipv6hdr));
-
-        new->protocol = htons(ETH_P_IPV6);
-        new->pkt_type = PACKET_HOST;
-
-        stat = lowpan_give_skb_to_devices(new);
-
-        kfree_skb(new);
-
-        return stat;
-}
-
 static void lowpan_fragment_timer_expired(unsigned long entry_addr)
 {
         struct lowpan_fragment *entry = (struct lowpan_fragment *)entry_addr;
@@ -814,16 +254,12 @@ frame_err:
         return NULL;
 }
 
-static int
-lowpan_process_data(struct sk_buff *skb)
+static int process_data(struct sk_buff *skb)
 {
-        struct ipv6hdr hdr = {};
-        u8 tmp, iphc0, iphc1, num_context = 0;
+        u8 iphc0, iphc1;
         const struct ieee802154_addr *_saddr, *_daddr;
-        int err;
 
-        lowpan_raw_dump_table(__func__, "raw skb data dump", skb->data,
-                                skb->len);
+        raw_dump_table(__func__, "raw skb data dump", skb->data, skb->len);
         /* at least two bytes will be used for the encoding */
         if (skb->len < 2)
                 goto drop;
@@ -925,162 +361,11 @@ lowpan_process_data(struct sk_buff *skb)
         _saddr = &mac_cb(skb)->sa;
         _daddr = &mac_cb(skb)->da;
 
-        pr_debug("iphc0 = %02x, iphc1 = %02x\n", iphc0, iphc1);
-
-        /* another if the CID flag is set */
-        if (iphc1 & LOWPAN_IPHC_CID) {
-                pr_debug("CID flag is set, increase header with one\n");
-                if (lowpan_fetch_skb_u8(skb, &num_context))
-                        goto drop;
-        }
-
-        hdr.version = 6;
-
-        /* Traffic Class and Flow Label */
-        switch ((iphc0 & LOWPAN_IPHC_TF) >> 3) {
-        /*
-         * Traffic Class and FLow Label carried in-line
-         * ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)
-         */
-        case 0: /* 00b */
-                if (lowpan_fetch_skb_u8(skb, &tmp))
-                        goto drop;
-
-                memcpy(&hdr.flow_lbl, &skb->data[0], 3);
-                skb_pull(skb, 3);
-                hdr.priority = ((tmp >> 2) & 0x0f);
-                hdr.flow_lbl[0] = ((tmp >> 2) & 0x30) | (tmp << 6) |
-                                        (hdr.flow_lbl[0] & 0x0f);
-                break;
-        /*
-         * Traffic class carried in-line
-         * ECN + DSCP (1 byte), Flow Label is elided
-         */
-        case 2: /* 10b */
-                if (lowpan_fetch_skb_u8(skb, &tmp))
-                        goto drop;
-
-                hdr.priority = ((tmp >> 2) & 0x0f);
-                hdr.flow_lbl[0] = ((tmp << 6) & 0xC0) | ((tmp >> 2) & 0x30);
-                break;
-        /*
-         * Flow Label carried in-line
-         * ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided
-         */
-        case 1: /* 01b */
-                if (lowpan_fetch_skb_u8(skb, &tmp))
-                        goto drop;
-
-                hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
-                memcpy(&hdr.flow_lbl[1], &skb->data[0], 2);
-                skb_pull(skb, 2);
-                break;
-        /* Traffic Class and Flow Label are elided */
-        case 3: /* 11b */
-                break;
-        default:
-                break;
-        }
-
-        /* Next Header */
-        if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
-                /* Next header is carried inline */
-                if (lowpan_fetch_skb_u8(skb, &(hdr.nexthdr)))
-                        goto drop;
-
-                pr_debug("NH flag is set, next header carried inline: %02x\n",
-                         hdr.nexthdr);
-        }
-
-        /* Hop Limit */
-        if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
-                hdr.hop_limit = lowpan_ttl_values[iphc0 & 0x03];
-        else {
-                if (lowpan_fetch_skb_u8(skb, &(hdr.hop_limit)))
-                        goto drop;
-        }
-
-        /* Extract SAM to the tmp variable */
-        tmp = ((iphc1 & LOWPAN_IPHC_SAM) >> LOWPAN_IPHC_SAM_BIT) & 0x03;
-
-        if (iphc1 & LOWPAN_IPHC_SAC) {
-                /* Source address context based uncompression */
-                pr_debug("SAC bit is set. Handle context based source address.\n");
-                err = lowpan_uncompress_context_based_src_addr(
-                                skb, &hdr.saddr, tmp);
-        } else {
-                /* Source address uncompression */
-                pr_debug("source address stateless compression\n");
-                err = lowpan_uncompress_addr(skb, &hdr.saddr, tmp, _saddr);
-        }
-
-        /* Check on error of previous branch */
-        if (err)
-                goto drop;
-
-        /* Extract DAM to the tmp variable */
-        tmp = ((iphc1 & LOWPAN_IPHC_DAM_11) >> LOWPAN_IPHC_DAM_BIT) & 0x03;
-
-        /* check for Multicast Compression */
-        if (iphc1 & LOWPAN_IPHC_M) {
-                if (iphc1 & LOWPAN_IPHC_DAC) {
-                        pr_debug("dest: context-based mcast compression\n");
-                        /* TODO: implement this */
-                } else {
-                        err = lowpan_uncompress_multicast_daddr(
-                                        skb, &hdr.daddr, tmp);
-                        if (err)
-                                goto drop;
-                }
-        } else {
-                pr_debug("dest: stateless compression\n");
-                err = lowpan_uncompress_addr(skb, &hdr.daddr, tmp, _daddr);
-                if (err)
-                        goto drop;
-        }
-
-        /* UDP data uncompression */
-        if (iphc0 & LOWPAN_IPHC_NH_C) {
-                struct udphdr uh;
-                struct sk_buff *new;
-                if (lowpan_uncompress_udp_header(skb, &uh))
-                        goto drop;
-
-                /*
-                 * replace the compressed UDP head by the uncompressed UDP
-                 * header
-                 */
-                new = skb_copy_expand(skb, sizeof(struct udphdr),
-                                      skb_tailroom(skb), GFP_ATOMIC);
-                kfree_skb(skb);
-
-                if (!new)
-                        return -ENOMEM;
-
-                skb = new;
-
-                skb_push(skb, sizeof(struct udphdr));
-                skb_copy_to_linear_data(skb, &uh, sizeof(struct udphdr));
-
-                lowpan_raw_dump_table(__func__, "raw UDP header dump",
-                                      (u8 *)&uh, sizeof(uh));
-
-                hdr.nexthdr = UIP_PROTO_UDP;
-        }
-
-        /* Not fragmented package */
-        hdr.payload_len = htons(skb->len);
-
-        pr_debug("skb headroom size = %d, data length = %d\n",
-                 skb_headroom(skb), skb->len);
-
-        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n\t"
-                 "nexthdr = 0x%02x\n\thop_lim = %d\n", hdr.version,
-                 ntohs(hdr.payload_len), hdr.nexthdr, hdr.hop_limit);
-
-        lowpan_raw_dump_table(__func__, "raw header dump", (u8 *)&hdr,
-                                                        sizeof(hdr));
-        return lowpan_skb_deliver(skb, &hdr);
+        return lowpan_process_data(skb, skb->dev, (u8 *)_saddr->hwaddr,
+                                _saddr->addr_type, IEEE802154_ADDR_LEN,
+                                (u8 *)_daddr->hwaddr, _daddr->addr_type,
+                                IEEE802154_ADDR_LEN, iphc0, iphc1,
+                                lowpan_give_skb_to_devices);
 
 unlock_and_drop:
         spin_unlock_bh(&flist_lock);
@@ -1112,7 +397,7 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,
         hlen = (type == LOWPAN_DISPATCH_FRAG1) ?
                         LOWPAN_FRAG1_HEAD_SIZE : LOWPAN_FRAGN_HEAD_SIZE;
 
-        lowpan_raw_dump_inline(__func__, "6lowpan fragment header", head, hlen);
+        raw_dump_inline(__func__, "6lowpan fragment header", head, hlen);
 
         frag = netdev_alloc_skb(skb->dev,
                                 hlen + mlen + plen + IEEE802154_MFR_SIZE);
@@ -1132,8 +417,7 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,
         skb_copy_to_linear_data_offset(frag, mlen + hlen,
                                        skb_network_header(skb) + offset, plen);
 
-        lowpan_raw_dump_table(__func__, " raw fragment dump", frag->data,
-                                                                frag->len);
+        raw_dump_table(__func__, " raw fragment dump", frag->data, frag->len);
 
         return dev_queue_xmit(frag);
 }
@@ -1316,7 +600,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
                 /* Pull off the 1-byte of 6lowpan header. */
                 skb_pull(local_skb, 1);
 
-                lowpan_give_skb_to_devices(local_skb);
+                lowpan_give_skb_to_devices(local_skb, NULL);
 
                 kfree_skb(local_skb);
                 kfree_skb(skb);
@@ -1328,7 +612,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
                         local_skb = skb_clone(skb, GFP_ATOMIC);
                         if (!local_skb)
                                 goto drop;
-                        lowpan_process_data(local_skb);
+                        process_data(local_skb);
 
                         kfree_skb(skb);
                         break;
diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h
index 2869c0526dad..2b835db3bda8 100644
--- a/net/ieee802154/6lowpan.h
+++ b/net/ieee802154/6lowpan.h
@@ -231,6 +231,61 @@
 #define LOWPAN_NHC_UDP_CS_P_10  0xF2 /* source = 0xF0 + 8bit inline,
                                         dest = 16 bit inline */
 #define LOWPAN_NHC_UDP_CS_P_11  0xF3 /* source & dest = 0xF0B + 4bit inline */
+#define LOWPAN_NHC_UDP_CS_C     0x04 /* checksum elided */
+
+#ifdef DEBUG
+/* print data in line */
+static inline void raw_dump_inline(const char *caller, char *msg,
+                                   unsigned char *buf, int len)
+{
+        if (msg)
+                pr_debug("%s():%s: ", caller, msg);
+
+        print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, buf, len, false);
+}
+
+/* print data in a table format:
+ *
+ * addr: xx xx xx xx xx xx
+ * addr: xx xx xx xx xx xx
+ * ...
+ */
+static inline void raw_dump_table(const char *caller, char *msg,
+                                  unsigned char *buf, int len)
+{
+        if (msg)
+                pr_debug("%s():%s:\n", caller, msg);
+
+        print_hex_dump_debug("\t", DUMP_PREFIX_OFFSET, 16, 1, buf, len, false);
+}
+#else
+static inline void raw_dump_table(const char *caller, char *msg,
+                                  unsigned char *buf, int len) { }
+static inline void raw_dump_inline(const char *caller, char *msg,
+                                   unsigned char *buf, int len) { }
+#endif
+
+static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
+{
+        if (unlikely(!pskb_may_pull(skb, 1)))
+                return -EINVAL;
+
+        *val = skb->data[0];
+        skb_pull(skb, 1);
+
+        return 0;
+}
+
+static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
+{
+        if (unlikely(!pskb_may_pull(skb, 2)))
+                return -EINVAL;
+
+        *val = (skb->data[0] << 8) | skb->data[1];
+        skb_pull(skb, 2);
+
+        return 0;
+}
 
 static inline bool lowpan_fetch_skb(struct sk_buff *skb,
                 void *data, const unsigned int len)
@@ -244,4 +299,21 @@ static inline bool lowpan_fetch_skb(struct sk_buff *skb,
         return false;
 }
 
+static inline void lowpan_push_hc_data(u8 **hc_ptr, const void *data,
+                                       const size_t len)
+{
+        memcpy(*hc_ptr, data, len);
+        *hc_ptr += len;
+}
+
+typedef int (*skb_delivery_cb)(struct sk_buff *skb, struct net_device *dev);
+
+int lowpan_process_data(struct sk_buff *skb, struct net_device *dev,
+                const u8 *saddr, const u8 saddr_type, const u8 saddr_len,
+                const u8 *daddr, const u8 daddr_type, const u8 daddr_len,
+                u8 iphc0, u8 iphc1, skb_delivery_cb skb_deliver);
+int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
+                        unsigned short type, const void *_daddr,
+                        const void *_saddr, unsigned int len);
+
 #endif /* __6LOWPAN_H__ */
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
new file mode 100644
index 000000000000..11840f9e46da
--- /dev/null
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -0,0 +1,799 @@
+/*
+ * Copyright 2011, Siemens AG
+ * written by Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ */
+
+/*
+ * Based on patches from Jon Smirl <jonsmirl@gmail.com>
+ * Copyright (c) 2011 Jon Smirl <jonsmirl@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Jon's code is based on 6lowpan implementation for Contiki which is:
+ * Copyright (c) 2008, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <linux/bitops.h>
+#include <linux/if_arp.h>
+#include <linux/netdevice.h>
+#include <net/ipv6.h>
+#include <net/af_ieee802154.h>
+
+#include "6lowpan.h"
+
+/*
+ * Uncompress address function for source and
+ * destination address(non-multicast).
+ *
+ * address_mode is sam value or dam value.
+ */
+static int uncompress_addr(struct sk_buff *skb,
+                                struct in6_addr *ipaddr, const u8 address_mode,
+                                const u8 *lladdr, const u8 addr_type,
+                                const u8 addr_len)
+{
+        bool fail;
+
+        switch (address_mode) {
+        case LOWPAN_IPHC_ADDR_00:
+                /* for global link addresses */
+                fail = lowpan_fetch_skb(skb, ipaddr->s6_addr, 16);
+                break;
+        case LOWPAN_IPHC_ADDR_01:
+                /* fe:80::XXXX:XXXX:XXXX:XXXX */
+                ipaddr->s6_addr[0] = 0xFE;
+                ipaddr->s6_addr[1] = 0x80;
+                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[8], 8);
+                break;
+        case LOWPAN_IPHC_ADDR_02:
+                /* fe:80::ff:fe00:XXXX */
+                ipaddr->s6_addr[0] = 0xFE;
+                ipaddr->s6_addr[1] = 0x80;
+                ipaddr->s6_addr[11] = 0xFF;
+                ipaddr->s6_addr[12] = 0xFE;
+                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[14], 2);
+                break;
+        case LOWPAN_IPHC_ADDR_03:
+                fail = false;
+                switch (addr_type) {
+                case IEEE802154_ADDR_LONG:
+                        /* fe:80::XXXX:XXXX:XXXX:XXXX
+                         *        \_________________/
+                         *              hwaddr
+                         */
+                        ipaddr->s6_addr[0] = 0xFE;
+                        ipaddr->s6_addr[1] = 0x80;
+                        memcpy(&ipaddr->s6_addr[8], lladdr, addr_len);
+                        /* second bit-flip (Universe/Local)
+                         * is done according RFC2464
+                         */
+                        ipaddr->s6_addr[8] ^= 0x02;
+                        break;
+                case IEEE802154_ADDR_SHORT:
+                        /* fe:80::ff:fe00:XXXX
+                         *                \__/
+                         *             short_addr
+                         *
+                         * Universe/Local bit is zero.
+                         */
+                        ipaddr->s6_addr[0] = 0xFE;
+                        ipaddr->s6_addr[1] = 0x80;
+                        ipaddr->s6_addr[11] = 0xFF;
+                        ipaddr->s6_addr[12] = 0xFE;
+                        ipaddr->s6_addr16[7] = htons(*((u16 *)lladdr));
+                        break;
+                default:
+                        pr_debug("Invalid addr_type set\n");
+                        return -EINVAL;
+                }
+                break;
+        default:
+                pr_debug("Invalid address mode value: 0x%x\n", address_mode);
+                return -EINVAL;
+        }
+
+        if (fail) {
+                pr_debug("Failed to fetch skb data\n");
+                return -EIO;
+        }
+
+        raw_dump_inline(NULL, "Reconstructed ipv6 addr is",
+                        ipaddr->s6_addr, 16);
+
+        return 0;
+}
+
+/*
+ * Uncompress address function for source context
+ * based address(non-multicast).
+ */
+static int uncompress_context_based_src_addr(struct sk_buff *skb,
+                                                struct in6_addr *ipaddr,
+                                                const u8 sam)
+{
+        switch (sam) {
+        case LOWPAN_IPHC_ADDR_00:
+                /* unspec address ::
+                 * Do nothing, address is already ::
+                 */
+                break;
+        case LOWPAN_IPHC_ADDR_01:
+                /* TODO */
+        case LOWPAN_IPHC_ADDR_02:
+                /* TODO */
+        case LOWPAN_IPHC_ADDR_03:
+                /* TODO */
+                netdev_warn(skb->dev, "SAM value 0x%x not supported\n", sam);
+                return -EINVAL;
+        default:
+                pr_debug("Invalid sam value: 0x%x\n", sam);
+                return -EINVAL;
+        }
+
+        raw_dump_inline(NULL,
+                        "Reconstructed context based ipv6 src addr is",
+                        ipaddr->s6_addr, 16);
+
+        return 0;
+}
+
+static int skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr,
+                struct net_device *dev, skb_delivery_cb deliver_skb)
+{
+        struct sk_buff *new;
+        int stat;
+
+        new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb),
+                                                                GFP_ATOMIC);
+        kfree_skb(skb);
+
+        if (!new)
+                return -ENOMEM;
+
+        skb_push(new, sizeof(struct ipv6hdr));
+        skb_reset_network_header(new);
+        skb_copy_to_linear_data(new, hdr, sizeof(struct ipv6hdr));
+
+        new->protocol = htons(ETH_P_IPV6);
+        new->pkt_type = PACKET_HOST;
+        new->dev = dev;
+
+        raw_dump_table(__func__, "raw skb data dump before receiving",
+                        new->data, new->len);
+
+        stat = deliver_skb(new, dev);
+
+        kfree_skb(new);
+
+        return stat;
+}
+
+/* Uncompress function for multicast destination address,
+ * when M bit is set.
+ */
+static int
+lowpan_uncompress_multicast_daddr(struct sk_buff *skb,
+                struct in6_addr *ipaddr,
+                const u8 dam)
+{
+        bool fail;
+
+        switch (dam) {
+        case LOWPAN_IPHC_DAM_00:
+                /* 00:  128 bits.  The full address
+                 * is carried in-line.
+                 */
+                fail = lowpan_fetch_skb(skb, ipaddr->s6_addr, 16);
+                break;
+        case LOWPAN_IPHC_DAM_01:
+                /* 01:  48 bits.  The address takes
+                 * the form ffXX::00XX:XXXX:XXXX.
+                 */
+                ipaddr->s6_addr[0] = 0xFF;
+                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[1], 1);
+                fail |= lowpan_fetch_skb(skb, &ipaddr->s6_addr[11], 5);
+                break;
+        case LOWPAN_IPHC_DAM_10:
+                /* 10:  32 bits.  The address takes
+                 * the form ffXX::00XX:XXXX.
+                 */
+                ipaddr->s6_addr[0] = 0xFF;
+                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[1], 1);
+                fail |= lowpan_fetch_skb(skb, &ipaddr->s6_addr[13], 3);
+                break;
+        case LOWPAN_IPHC_DAM_11:
+                /* 11:  8 bits.  The address takes
+                 * the form ff02::00XX.
+                 */
+                ipaddr->s6_addr[0] = 0xFF;
+                ipaddr->s6_addr[1] = 0x02;
+                fail = lowpan_fetch_skb(skb, &ipaddr->s6_addr[15], 1);
+                break;
+        default:
+                pr_debug("DAM value has a wrong value: 0x%x\n", dam);
+                return -EINVAL;
+        }
+
+        if (fail) {
+                pr_debug("Failed to fetch skb data\n");
+                return -EIO;
+        }
+
+        raw_dump_inline(NULL, "Reconstructed ipv6 multicast addr is",
+                                ipaddr->s6_addr, 16);
+
+        return 0;
+}
+
+static int
+uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)
+{
+        bool fail;
+        u8 tmp = 0, val = 0;
+
+        if (!uh)
+                goto err;
+
+        fail = lowpan_fetch_skb(skb, &tmp, 1);
+
+        if ((tmp & LOWPAN_NHC_UDP_MASK) == LOWPAN_NHC_UDP_ID) {
+                pr_debug("UDP header uncompression\n");
+                switch (tmp & LOWPAN_NHC_UDP_CS_P_11) {
+                case LOWPAN_NHC_UDP_CS_P_00:
+                        fail |= lowpan_fetch_skb(skb, &uh->source, 2);
+                        fail |= lowpan_fetch_skb(skb, &uh->dest, 2);
+                        break;
+                case LOWPAN_NHC_UDP_CS_P_01:
+                        fail |= lowpan_fetch_skb(skb, &uh->source, 2);
+                        fail |= lowpan_fetch_skb(skb, &val, 1);
+                        uh->dest = htons(val + LOWPAN_NHC_UDP_8BIT_PORT);
+                        break;
+                case LOWPAN_NHC_UDP_CS_P_10:
+                        fail |= lowpan_fetch_skb(skb, &val, 1);
+                        uh->source = htons(val + LOWPAN_NHC_UDP_8BIT_PORT);
+                        fail |= lowpan_fetch_skb(skb, &uh->dest, 2);
+                        break;
+                case LOWPAN_NHC_UDP_CS_P_11:
+                        fail |= lowpan_fetch_skb(skb, &val, 1);
+                        uh->source = htons(LOWPAN_NHC_UDP_4BIT_PORT +
+                                           (val >> 4));
+                        uh->dest = htons(LOWPAN_NHC_UDP_4BIT_PORT +
+                                         (val & 0x0f));
+                        break;
+                default:
+                        pr_debug("ERROR: unknown UDP format\n");
+                        goto err;
+                        break;
+                }
+
+                pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
+                         ntohs(uh->source), ntohs(uh->dest));
+
+                /* checksum */
+                if (tmp & LOWPAN_NHC_UDP_CS_C) {
+                        pr_debug_ratelimited("checksum elided currently not supported\n");
+                        goto err;
+                } else {
+                        fail |= lowpan_fetch_skb(skb, &uh->check, 2);
+                }
+
+                /*
+                 * UDP lenght needs to be infered from the lower layers
+                 * here, we obtain the hint from the remaining size of the
+                 * frame
+                 */
+                uh->len = htons(skb->len + sizeof(struct udphdr));
+                pr_debug("uncompressed UDP length: src = %d", ntohs(uh->len));
+        } else {
+                pr_debug("ERROR: unsupported NH format\n");
+                goto err;
+        }
+
+        if (fail)
+                goto err;
+
+        return 0;
+err:
+        return -EINVAL;
+}
+
+/* TTL uncompression values */
+static const u8 lowpan_ttl_values[] = { 0, 1, 64, 255 };
+
+int lowpan_process_data(struct sk_buff *skb, struct net_device *dev,
+                const u8 *saddr, const u8 saddr_type, const u8 saddr_len,
+                const u8 *daddr, const u8 daddr_type, const u8 daddr_len,
+                u8 iphc0, u8 iphc1, skb_delivery_cb deliver_skb)
+{
+        struct ipv6hdr hdr = {};
+        u8 tmp, num_context = 0;
+        int err;
+
+        raw_dump_table(__func__, "raw skb data dump uncompressed",
+                                skb->data, skb->len);
+
+        /* another if the CID flag is set */
+        if (iphc1 & LOWPAN_IPHC_CID) {
+                pr_debug("CID flag is set, increase header with one\n");
+                if (lowpan_fetch_skb_u8(skb, &num_context))
+                        goto drop;
+        }
+
+        hdr.version = 6;
+
+        /* Traffic Class and Flow Label */
+        switch ((iphc0 & LOWPAN_IPHC_TF) >> 3) {
+        /*
+         * Traffic Class and FLow Label carried in-line
+         * ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)
+         */
+        case 0: /* 00b */
+                if (lowpan_fetch_skb_u8(skb, &tmp))
+                        goto drop;
+
+                memcpy(&hdr.flow_lbl, &skb->data[0], 3);
+                skb_pull(skb, 3);
+                hdr.priority = ((tmp >> 2) & 0x0f);
+                hdr.flow_lbl[0] = ((tmp >> 2) & 0x30) | (tmp << 6) |
+                                        (hdr.flow_lbl[0] & 0x0f);
+                break;
+        /*
+         * Traffic class carried in-line
+         * ECN + DSCP (1 byte), Flow Label is elided
+         */
+        case 2: /* 10b */
+                if (lowpan_fetch_skb_u8(skb, &tmp))
+                        goto drop;
+
+                hdr.priority = ((tmp >> 2) & 0x0f);
+                hdr.flow_lbl[0] = ((tmp << 6) & 0xC0) | ((tmp >> 2) & 0x30);
+                break;
+        /*
+         * Flow Label carried in-line
+         * ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided
+         */
+        case 1: /* 01b */
+                if (lowpan_fetch_skb_u8(skb, &tmp))
+                        goto drop;
+
+                hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
+                memcpy(&hdr.flow_lbl[1], &skb->data[0], 2);
+                skb_pull(skb, 2);
+                break;
+        /* Traffic Class and Flow Label are elided */
+        case 3: /* 11b */
+                break;
+        default:
+                break;
+        }
+
+        /* Next Header */
+        if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
+                /* Next header is carried inline */
+                if (lowpan_fetch_skb_u8(skb, &(hdr.nexthdr)))
+                        goto drop;
+
+                pr_debug("NH flag is set, next header carried inline: %02x\n",
+                         hdr.nexthdr);
+        }
+
+        /* Hop Limit */
+        if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
+                hdr.hop_limit = lowpan_ttl_values[iphc0 & 0x03];
+        else {
+                if (lowpan_fetch_skb_u8(skb, &(hdr.hop_limit)))
+                        goto drop;
+        }
+
+        /* Extract SAM to the tmp variable */
+        tmp = ((iphc1 & LOWPAN_IPHC_SAM) >> LOWPAN_IPHC_SAM_BIT) & 0x03;
+
+        if (iphc1 & LOWPAN_IPHC_SAC) {
+                /* Source address context based uncompression */
+                pr_debug("SAC bit is set. Handle context based source address.\n");
+                err = uncompress_context_based_src_addr(
+                                skb, &hdr.saddr, tmp);
+        } else {
+                /* Source address uncompression */
+                pr_debug("source address stateless compression\n");
+                err = uncompress_addr(skb, &hdr.saddr, tmp, saddr,
+                                        saddr_type, saddr_len);
+        }
+
+        /* Check on error of previous branch */
+        if (err)
+                goto drop;
+
+        /* Extract DAM to the tmp variable */
+        tmp = ((iphc1 & LOWPAN_IPHC_DAM_11) >> LOWPAN_IPHC_DAM_BIT) & 0x03;
+
+        /* check for Multicast Compression */
+        if (iphc1 & LOWPAN_IPHC_M) {
+                if (iphc1 & LOWPAN_IPHC_DAC) {
+                        pr_debug("dest: context-based mcast compression\n");
+                        /* TODO: implement this */
+                } else {
+                        err = lowpan_uncompress_multicast_daddr(
+                                                skb, &hdr.daddr, tmp);
+                        if (err)
+                                goto drop;
+                }
+        } else {
+                err = uncompress_addr(skb, &hdr.daddr, tmp, daddr,
+                                        daddr_type, daddr_len);
+                pr_debug("dest: stateless compression mode %d dest %pI6c\n",
+                        tmp, &hdr.daddr);
+                if (err)
+                        goto drop;
+        }
+
+        /* UDP data uncompression */
+        if (iphc0 & LOWPAN_IPHC_NH_C) {
+                struct udphdr uh;
+                struct sk_buff *new;
+                if (uncompress_udp_header(skb, &uh))
+                        goto drop;
+
+                /*
+                 * replace the compressed UDP head by the uncompressed UDP
+                 * header
+                 */
+                new = skb_copy_expand(skb, sizeof(struct udphdr),
+                                      skb_tailroom(skb), GFP_ATOMIC);
+                kfree_skb(skb);
+
+                if (!new)
+                        return -ENOMEM;
+
+                skb = new;
+
+                skb_push(skb, sizeof(struct udphdr));
+                skb_reset_transport_header(skb);
+                skb_copy_to_linear_data(skb, &uh, sizeof(struct udphdr));
+
+                raw_dump_table(__func__, "raw UDP header dump",
+                                      (u8 *)&uh, sizeof(uh));
+
+                hdr.nexthdr = UIP_PROTO_UDP;
+        }
+
+        hdr.payload_len = htons(skb->len);
+
+        pr_debug("skb headroom size = %d, data length = %d\n",
+                 skb_headroom(skb), skb->len);
+
+        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n\t"
+                 "nexthdr = 0x%02x\n\thop_lim = %d\n\tdest    = %pI6c\n",
+                hdr.version, ntohs(hdr.payload_len), hdr.nexthdr,
+                hdr.hop_limit, &hdr.daddr);
+
+        raw_dump_table(__func__, "raw header dump", (u8 *)&hdr,
+                                                        sizeof(hdr));
+
+        return skb_deliver(skb, &hdr, dev, deliver_skb);
+
+drop:
+        kfree_skb(skb);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(lowpan_process_data);
+
+static u8 lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift,
+                                const struct in6_addr *ipaddr,
+                                const unsigned char *lladdr)
+{
+        u8 val = 0;
+
+        if (is_addr_mac_addr_based(ipaddr, lladdr)) {
+                val = 3; /* 0-bits */
+                pr_debug("address compression 0 bits\n");
+        } else if (lowpan_is_iid_16_bit_compressable(ipaddr)) {
+                /* compress IID to 16 bits xxxx::XXXX */
+                memcpy(*hc06_ptr, &ipaddr->s6_addr16[7], 2);
+                *hc06_ptr += 2;
+                val = 2; /* 16-bits */
+                raw_dump_inline(NULL, "Compressed ipv6 addr is (16 bits)",
+                        *hc06_ptr - 2, 2);
+        } else {
+                /* do not compress IID => xxxx::IID */
+                memcpy(*hc06_ptr, &ipaddr->s6_addr16[4], 8);
+                *hc06_ptr += 8;
+                val = 1; /* 64-bits */
+                raw_dump_inline(NULL, "Compressed ipv6 addr is (64 bits)",
+                        *hc06_ptr - 8, 8);
+        }
+
+        return rol8(val, shift);
+}
+
+static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
+{
+        struct udphdr *uh = udp_hdr(skb);
+        u8 tmp;
+
+        if (((ntohs(uh->source) & LOWPAN_NHC_UDP_4BIT_MASK) ==
+             LOWPAN_NHC_UDP_4BIT_PORT) &&
+            ((ntohs(uh->dest) & LOWPAN_NHC_UDP_4BIT_MASK) ==
+             LOWPAN_NHC_UDP_4BIT_PORT)) {
+                pr_debug("UDP header: both ports compression to 4 bits\n");
+                /* compression value */
+                tmp = LOWPAN_NHC_UDP_CS_P_11;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+                /* source and destination port */
+                tmp = ntohs(uh->dest) - LOWPAN_NHC_UDP_4BIT_PORT +
+                      ((ntohs(uh->source) - LOWPAN_NHC_UDP_4BIT_PORT) << 4);
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+        } else if ((ntohs(uh->dest) & LOWPAN_NHC_UDP_8BIT_MASK) ==
+                        LOWPAN_NHC_UDP_8BIT_PORT) {
+                pr_debug("UDP header: remove 8 bits of dest\n");
+                /* compression value */
+                tmp = LOWPAN_NHC_UDP_CS_P_01;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+                /* source port */
+                lowpan_push_hc_data(hc06_ptr, &uh->source, sizeof(uh->source));
+                /* destination port */
+                tmp = ntohs(uh->dest) - LOWPAN_NHC_UDP_8BIT_PORT;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+        } else if ((ntohs(uh->source) & LOWPAN_NHC_UDP_8BIT_MASK) ==
+                        LOWPAN_NHC_UDP_8BIT_PORT) {
+                pr_debug("UDP header: remove 8 bits of source\n");
+                /* compression value */
+                tmp = LOWPAN_NHC_UDP_CS_P_10;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+                /* source port */
+                tmp = ntohs(uh->source) - LOWPAN_NHC_UDP_8BIT_PORT;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+                /* destination port */
+                lowpan_push_hc_data(hc06_ptr, &uh->dest, sizeof(uh->dest));
+        } else {
+                pr_debug("UDP header: can't compress\n");
+                /* compression value */
+                tmp = LOWPAN_NHC_UDP_CS_P_00;
+                lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
+                /* source port */
+                lowpan_push_hc_data(hc06_ptr, &uh->source, sizeof(uh->source));
+                /* destination port */
+                lowpan_push_hc_data(hc06_ptr, &uh->dest, sizeof(uh->dest));
+        }
+
+        /* checksum is always inline */
+        lowpan_push_hc_data(hc06_ptr, &uh->check, sizeof(uh->check));
+
+        /* skip the UDP header */
+        skb_pull(skb, sizeof(struct udphdr));
+}
+
+int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
+                        unsigned short type, const void *_daddr,
+                        const void *_saddr, unsigned int len)
+{
+        u8 tmp, iphc0, iphc1, *hc06_ptr;
+        struct ipv6hdr *hdr;
+        u8 head[100] = {};
+
+        if (type != ETH_P_IPV6)
+                return -EINVAL;
+
+        hdr = ipv6_hdr(skb);
+        hc06_ptr = head + 2;
+
+        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n"
+                 "\tnexthdr = 0x%02x\n\thop_lim = %d\n\tdest    = %pI6c\n",
+                hdr->version, ntohs(hdr->payload_len), hdr->nexthdr,
+                hdr->hop_limit, &hdr->daddr);
+
+        raw_dump_table(__func__, "raw skb network header dump",
+                skb_network_header(skb), sizeof(struct ipv6hdr));
+
+        /*
+         * As we copy some bit-length fields, in the IPHC encoding bytes,
+         * we sometimes use |=
+         * If the field is 0, and the current bit value in memory is 1,
+         * this does not work. We therefore reset the IPHC encoding here
+         */
+        iphc0 = LOWPAN_DISPATCH_IPHC;
+        iphc1 = 0;
+
+        /* TODO: context lookup */
+
+        raw_dump_inline(__func__, "saddr",
+                        (unsigned char *)_saddr, IEEE802154_ADDR_LEN);
+        raw_dump_inline(__func__, "daddr",
+                        (unsigned char *)_daddr, IEEE802154_ADDR_LEN);
+
+        raw_dump_table(__func__,
+                        "sending raw skb network uncompressed packet",
+                        skb->data, skb->len);
+
+        /*
+         * Traffic class, flow label
+         * If flow label is 0, compress it. If traffic class is 0, compress it
+         * We have to process both in the same time as the offset of traffic
+         * class depends on the presence of version and flow label
+         */
+
+        /* hc06 format of TC is ECN | DSCP , original one is DSCP | ECN */
+        tmp = (hdr->priority << 4) | (hdr->flow_lbl[0] >> 4);
+        tmp = ((tmp & 0x03) << 6) | (tmp >> 2);
+
+        if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
+             (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
+                /* flow label can be compressed */
+                iphc0 |= LOWPAN_IPHC_FL_C;
+                if ((hdr->priority == 0) &&
+                   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+                        /* compress (elide) all */
+                        iphc0 |= LOWPAN_IPHC_TC_C;
+                } else {
+                        /* compress only the flow label */
+                        *hc06_ptr = tmp;
+                        hc06_ptr += 1;
+                }
+        } else {
+                /* Flow label cannot be compressed */
+                if ((hdr->priority == 0) &&
+                   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+                        /* compress only traffic class */
+                        iphc0 |= LOWPAN_IPHC_TC_C;
+                        *hc06_ptr = (tmp & 0xc0) | (hdr->flow_lbl[0] & 0x0F);
+                        memcpy(hc06_ptr + 1, &hdr->flow_lbl[1], 2);
+                        hc06_ptr += 3;
+                } else {
+                        /* compress nothing */
+                        memcpy(hc06_ptr, &hdr, 4);
+                        /* replace the top byte with new ECN | DSCP format */
+                        *hc06_ptr = tmp;
+                        hc06_ptr += 4;
+                }
+        }
+
+        /* NOTE: payload length is always compressed */
+
+        /* Next Header is compress if UDP */
+        if (hdr->nexthdr == UIP_PROTO_UDP)
+                iphc0 |= LOWPAN_IPHC_NH_C;
+
+        if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
+                *hc06_ptr = hdr->nexthdr;
+                hc06_ptr += 1;
+        }
+
+        /*
+         * Hop limit
+         * if 1:   compress, encoding is 01
+         * if 64:  compress, encoding is 10
+         * if 255: compress, encoding is 11
+         * else do not compress
+         */
+        switch (hdr->hop_limit) {
+        case 1:
+                iphc0 |= LOWPAN_IPHC_TTL_1;
+                break;
+        case 64:
+                iphc0 |= LOWPAN_IPHC_TTL_64;
+                break;
+        case 255:
+                iphc0 |= LOWPAN_IPHC_TTL_255;
+                break;
+        default:
+                *hc06_ptr = hdr->hop_limit;
+                hc06_ptr += 1;
+                break;
+        }
+
+        /* source address compression */
+        if (is_addr_unspecified(&hdr->saddr)) {
+                pr_debug("source address is unspecified, setting SAC\n");
+                iphc1 |= LOWPAN_IPHC_SAC;
+        /* TODO: context lookup */
+        } else if (is_addr_link_local(&hdr->saddr)) {
+                iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
+                                LOWPAN_IPHC_SAM_BIT, &hdr->saddr, _saddr);
+                pr_debug("source address unicast link-local %pI6c "
+                        "iphc1 0x%02x\n", &hdr->saddr, iphc1);
+        } else {
+                pr_debug("send the full source address\n");
+                memcpy(hc06_ptr, &hdr->saddr.s6_addr16[0], 16);
+                hc06_ptr += 16;
+        }
+
+        /* destination address compression */
+        if (is_addr_mcast(&hdr->daddr)) {
+                pr_debug("destination address is multicast: ");
+                iphc1 |= LOWPAN_IPHC_M;
+                if (lowpan_is_mcast_addr_compressable8(&hdr->daddr)) {
+                        pr_debug("compressed to 1 octet\n");
+                        iphc1 |= LOWPAN_IPHC_DAM_11;
+                        /* use last byte */
+                        *hc06_ptr = hdr->daddr.s6_addr[15];
+                        hc06_ptr += 1;
+                } else if (lowpan_is_mcast_addr_compressable32(&hdr->daddr)) {
+                        pr_debug("compressed to 4 octets\n");
+                        iphc1 |= LOWPAN_IPHC_DAM_10;
+                        /* second byte + the last three */
+                        *hc06_ptr = hdr->daddr.s6_addr[1];
+                        memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[13], 3);
+                        hc06_ptr += 4;
+                } else if (lowpan_is_mcast_addr_compressable48(&hdr->daddr)) {
+                        pr_debug("compressed to 6 octets\n");
+                        iphc1 |= LOWPAN_IPHC_DAM_01;
+                        /* second byte + the last five */
+                        *hc06_ptr = hdr->daddr.s6_addr[1];
+                        memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[11], 5);
+                        hc06_ptr += 6;
+                } else {
+                        pr_debug("using full address\n");
+                        iphc1 |= LOWPAN_IPHC_DAM_00;
+                        memcpy(hc06_ptr, &hdr->daddr.s6_addr[0], 16);
+                        hc06_ptr += 16;
+                }
+        } else {
+                /* TODO: context lookup */
+                if (is_addr_link_local(&hdr->daddr)) {
+                        iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
+                                LOWPAN_IPHC_DAM_BIT, &hdr->daddr, _daddr);
+                        pr_debug("dest address unicast link-local %pI6c "
+                                "iphc1 0x%02x\n", &hdr->daddr, iphc1);
+                } else {
+                        pr_debug("dest address unicast %pI6c\n", &hdr->daddr);
+                        memcpy(hc06_ptr, &hdr->daddr.s6_addr16[0], 16);
+                        hc06_ptr += 16;
+                }
+        }
+
+        /* UDP header compression */
+        if (hdr->nexthdr == UIP_PROTO_UDP)
+                compress_udp_header(&hc06_ptr, skb);
+
+        head[0] = iphc0;
+        head[1] = iphc1;
+
+        skb_pull(skb, sizeof(struct ipv6hdr));
+        skb_reset_transport_header(skb);
+        memcpy(skb_push(skb, hc06_ptr - head), head, hc06_ptr - head);
+        skb_reset_network_header(skb);
+
+        pr_debug("header len %d skb %u\n", (int)(hc06_ptr - head), skb->len);
+
+        raw_dump_table(__func__, "raw skb data dump compressed",
+                                skb->data, skb->len);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(lowpan_header_compress);
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index d7716d64c6bb..951a83ee8af4 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
-obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o
+obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o 6lowpan_iphc.o
 
 ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o
 af_802154-y := af_ieee802154.o raw.o dgram.o
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 07a5ed374262..d3929a69f008 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -113,7 +113,7 @@ static inline struct dst_entry *tunnel_dst_get(struct ip_tunnel *t)
         return dst;
 }
 
-struct dst_entry *tunnel_dst_check(struct ip_tunnel *t, u32 cookie)
+static struct dst_entry *tunnel_dst_check(struct ip_tunnel *t, u32 cookie)
 {
         struct dst_entry *dst = tunnel_dst_get(t);
 
diff --git a/net/ipv4/netfilter/nf_tables_arp.c b/net/ipv4/netfilter/nf_tables_arp.c
index 3e67ef1c676f..19412a4063fb 100644
--- a/net/ipv4/netfilter/nf_tables_arp.c
+++ b/net/ipv4/netfilter/nf_tables_arp.c
@@ -14,10 +14,30 @@
 #include <linux/netfilter_arp.h>
 #include <net/netfilter/nf_tables.h>
 
+static unsigned int
+nft_do_chain_arp(const struct nf_hook_ops *ops,
+                  struct sk_buff *skb,
+                  const struct net_device *in,
+                  const struct net_device *out,
+                  int (*okfn)(struct sk_buff *))
+{
+        struct nft_pktinfo pkt;
+
+        nft_set_pktinfo(&pkt, ops, skb, in, out);
+
+        return nft_do_chain(&pkt, ops);
+}
+
 static struct nft_af_info nft_af_arp __read_mostly = {
         .family         = NFPROTO_ARP,
         .nhooks         = NF_ARP_NUMHOOKS,
         .owner          = THIS_MODULE,
+        .nops           = 1,
+        .hooks          = {
+                [NF_ARP_IN]             = nft_do_chain_arp,
+                [NF_ARP_OUT]            = nft_do_chain_arp,
+                [NF_ARP_FORWARD]        = nft_do_chain_arp,
+        },
 };
 
 static int nf_tables_arp_init_net(struct net *net)
@@ -48,32 +68,14 @@ static struct pernet_operations nf_tables_arp_net_ops = {
         .exit   = nf_tables_arp_exit_net,
 };
 
-static unsigned int
-nft_do_chain_arp(const struct nf_hook_ops *ops,
-                  struct sk_buff *skb,
-                  const struct net_device *in,
-                  const struct net_device *out,
-                  int (*okfn)(struct sk_buff *))
-{
-        struct nft_pktinfo pkt;
-
-        nft_set_pktinfo(&pkt, ops, skb, in, out);
-
-        return nft_do_chain_pktinfo(&pkt, ops);
-}
-
-static struct nf_chain_type filter_arp = {
-        .family         = NFPROTO_ARP,
+static const struct nf_chain_type filter_arp = {
         .name           = "filter",
         .type           = NFT_CHAIN_T_DEFAULT,
+        .family         = NFPROTO_ARP,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_ARP_IN) |
                           (1 << NF_ARP_OUT) |
                           (1 << NF_ARP_FORWARD),
-        .fn             = {
-                [NF_ARP_IN]             = nft_do_chain_arp,
-                [NF_ARP_OUT]            = nft_do_chain_arp,
-                [NF_ARP_FORWARD]        = nft_do_chain_arp,
-        },
 };
 
 static int __init nf_tables_arp_init(void)
diff --git a/net/ipv4/netfilter/nf_tables_ipv4.c b/net/ipv4/netfilter/nf_tables_ipv4.c
index 0f4cbfeb19bd..6820c8c40842 100644
--- a/net/ipv4/netfilter/nf_tables_ipv4.c
+++ b/net/ipv4/netfilter/nf_tables_ipv4.c
@@ -18,14 +18,25 @@
 #include <net/ip.h>
 #include <net/netfilter/nf_tables_ipv4.h>
 
+static unsigned int nft_do_chain_ipv4(const struct nf_hook_ops *ops,
+                                      struct sk_buff *skb,
+                                      const struct net_device *in,
+                                      const struct net_device *out,
+                                      int (*okfn)(struct sk_buff *))
+{
+        struct nft_pktinfo pkt;
+
+        nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);
+
+        return nft_do_chain(&pkt, ops);
+}
+
 static unsigned int nft_ipv4_output(const struct nf_hook_ops *ops,
                                     struct sk_buff *skb,
                                     const struct net_device *in,
                                     const struct net_device *out,
                                     int (*okfn)(struct sk_buff *))
 {
-        struct nft_pktinfo pkt;
-
         if (unlikely(skb->len < sizeof(struct iphdr) ||
                      ip_hdr(skb)->ihl < sizeof(struct iphdr) / 4)) {
                 if (net_ratelimit())
@@ -33,19 +44,24 @@ static unsigned int nft_ipv4_output(const struct nf_hook_ops *ops,
                                 "packet\n");
                 return NF_ACCEPT;
         }
-        nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);
 
-        return nft_do_chain_pktinfo(&pkt, ops);
+        return nft_do_chain_ipv4(ops, skb, in, out, okfn);
 }
 
-static struct nft_af_info nft_af_ipv4 __read_mostly = {
+struct nft_af_info nft_af_ipv4 __read_mostly = {
         .family         = NFPROTO_IPV4,
         .nhooks         = NF_INET_NUMHOOKS,
         .owner          = THIS_MODULE,
+        .nops           = 1,
         .hooks          = {
+                [NF_INET_LOCAL_IN]      = nft_do_chain_ipv4,
                 [NF_INET_LOCAL_OUT]     = nft_ipv4_output,
+                [NF_INET_FORWARD]       = nft_do_chain_ipv4,
+                [NF_INET_PRE_ROUTING]   = nft_do_chain_ipv4,
+                [NF_INET_POST_ROUTING]  = nft_do_chain_ipv4,
         },
 };
+EXPORT_SYMBOL_GPL(nft_af_ipv4);
 
 static int nf_tables_ipv4_init_net(struct net *net)
 {
@@ -75,42 +91,28 @@ static struct pernet_operations nf_tables_ipv4_net_ops = {
         .exit   = nf_tables_ipv4_exit_net,
 };
 
-static unsigned int
-nft_do_chain_ipv4(const struct nf_hook_ops *ops,
-                  struct sk_buff *skb,
-                  const struct net_device *in,
-                  const struct net_device *out,
-                  int (*okfn)(struct sk_buff *))
-{
-        struct nft_pktinfo pkt;
-
-        nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);
-
-        return nft_do_chain_pktinfo(&pkt, ops);
-}
-
-static struct nf_chain_type filter_ipv4 = {
-        .family         = NFPROTO_IPV4,
+static const struct nf_chain_type filter_ipv4 = {
         .name           = "filter",
         .type           = NFT_CHAIN_T_DEFAULT,
+        .family         = NFPROTO_IPV4,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_LOCAL_IN) |
                           (1 << NF_INET_LOCAL_OUT) |
                           (1 << NF_INET_FORWARD) |
                           (1 << NF_INET_PRE_ROUTING) |
                           (1 << NF_INET_POST_ROUTING),
-        .fn             = {
-                [NF_INET_LOCAL_IN]      = nft_do_chain_ipv4,
-                [NF_INET_LOCAL_OUT]     = nft_ipv4_output,
-                [NF_INET_FORWARD]       = nft_do_chain_ipv4,
-                [NF_INET_PRE_ROUTING]   = nft_do_chain_ipv4,
-                [NF_INET_POST_ROUTING]  = nft_do_chain_ipv4,
-        },
 };
 
 static int __init nf_tables_ipv4_init(void)
 {
+        int ret;
+
         nft_register_chain_type(&filter_ipv4);
-        return register_pernet_subsys(&nf_tables_ipv4_net_ops);
+        ret = register_pernet_subsys(&nf_tables_ipv4_net_ops);
+        if (ret < 0)
+                nft_unregister_chain_type(&filter_ipv4);
+
+        return ret;
 }
 
 static void __exit nf_tables_ipv4_exit(void)
diff --git a/net/ipv4/netfilter/nft_chain_nat_ipv4.c b/net/ipv4/netfilter/nft_chain_nat_ipv4.c
index cf2c792cd971..b5b256d45e67 100644
--- a/net/ipv4/netfilter/nft_chain_nat_ipv4.c
+++ b/net/ipv4/netfilter/nft_chain_nat_ipv4.c
@@ -75,7 +75,7 @@ static unsigned int nf_nat_fn(const struct nf_hook_ops *ops,
 
                 nft_set_pktinfo_ipv4(&pkt, ops, skb, in, out);
 
-                ret = nft_do_chain_pktinfo(&pkt, ops);
+                ret = nft_do_chain(&pkt, ops);
                 if (ret != NF_ACCEPT)
                         return ret;
                 if (!nf_nat_initialized(ct, maniptype)) {
@@ -164,21 +164,21 @@ static unsigned int nf_nat_output(const struct nf_hook_ops *ops,
         return ret;
 }
 
-static struct nf_chain_type nft_chain_nat_ipv4 = {
-        .family         = NFPROTO_IPV4,
+static const struct nf_chain_type nft_chain_nat_ipv4 = {
         .name           = "nat",
         .type           = NFT_CHAIN_T_NAT,
+        .family         = NFPROTO_IPV4,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_PRE_ROUTING) |
                           (1 << NF_INET_POST_ROUTING) |
                           (1 << NF_INET_LOCAL_OUT) |
                           (1 << NF_INET_LOCAL_IN),
-        .fn             = {
+        .hooks          = {
                 [NF_INET_PRE_ROUTING]   = nf_nat_prerouting,
                 [NF_INET_POST_ROUTING]  = nf_nat_postrouting,
                 [NF_INET_LOCAL_OUT]     = nf_nat_output,
                 [NF_INET_LOCAL_IN]      = nf_nat_fn,
         },
-        .me             = THIS_MODULE,
 };
 
 static int __init nft_chain_nat_init(void)
diff --git a/net/ipv4/netfilter/nft_chain_route_ipv4.c b/net/ipv4/netfilter/nft_chain_route_ipv4.c
index 4e6bf9a3d7aa..125b66766c0a 100644
--- a/net/ipv4/netfilter/nft_chain_route_ipv4.c
+++ b/net/ipv4/netfilter/nft_chain_route_ipv4.c
@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
         daddr = iph->daddr;
         tos = iph->tos;
 
-        ret = nft_do_chain_pktinfo(&pkt, ops);
+        ret = nft_do_chain(&pkt, ops);
         if (ret != NF_DROP && ret != NF_QUEUE) {
                 iph = ip_hdr(skb);
 
@@ -61,15 +61,15 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
         return ret;
 }
 
-static struct nf_chain_type nft_chain_route_ipv4 = {
-        .family         = NFPROTO_IPV4,
+static const struct nf_chain_type nft_chain_route_ipv4 = {
         .name           = "route",
         .type           = NFT_CHAIN_T_ROUTE,
+        .family         = NFPROTO_IPV4,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_LOCAL_OUT),
-        .fn             = {
+        .hooks          = {
                 [NF_INET_LOCAL_OUT]     = nf_route_table_hook,
         },
-        .me             = THIS_MODULE,
 };
 
 static int __init nft_chain_route_init(void)
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 06493736fbc8..699a42faab9c 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -31,7 +31,8 @@ struct tcp_fastopen_metrics {
 
 struct tcp_metrics_block {
         struct tcp_metrics_block __rcu  *tcpm_next;
-        struct inetpeer_addr            tcpm_addr;
+        struct inetpeer_addr            tcpm_saddr;
+        struct inetpeer_addr            tcpm_daddr;
         unsigned long                   tcpm_stamp;
         u32                             tcpm_ts;
         u32                             tcpm_ts_stamp;
@@ -131,7 +132,8 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst,
 }
 
 static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,
-                                          struct inetpeer_addr *addr,
+                                          struct inetpeer_addr *saddr,
+                                          struct inetpeer_addr *daddr,
                                           unsigned int hash,
                                           bool reclaim)
 {
@@ -155,7 +157,8 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,
                 if (!tm)
                         goto out_unlock;
         }
-        tm->tcpm_addr = *addr;
+        tm->tcpm_saddr = *saddr;
+        tm->tcpm_daddr = *daddr;
 
         tcpm_suck_dst(tm, dst, true);
 
@@ -189,7 +192,8 @@ static struct tcp_metrics_block *tcp_get_encode(struct tcp_metrics_block *tm, in
         return NULL;
 }
 
-static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *addr,
+static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *saddr,
+                                                   const struct inetpeer_addr *daddr,
                                                    struct net *net, unsigned int hash)
 {
         struct tcp_metrics_block *tm;
@@ -197,7 +201,8 @@ static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *a
 
         for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
              tm = rcu_dereference(tm->tcpm_next)) {
-                if (addr_same(&tm->tcpm_addr, addr))
+                if (addr_same(&tm->tcpm_saddr, saddr) &&
+                    addr_same(&tm->tcpm_daddr, daddr))
                         break;
                 depth++;
         }
@@ -208,19 +213,22 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,
                                                        struct dst_entry *dst)
 {
         struct tcp_metrics_block *tm;
-        struct inetpeer_addr addr;
+        struct inetpeer_addr saddr, daddr;
         unsigned int hash;
         struct net *net;
 
-        addr.family = req->rsk_ops->family;
-        switch (addr.family) {
+        saddr.family = req->rsk_ops->family;
+        daddr.family = req->rsk_ops->family;
+        switch (daddr.family) {
         case AF_INET:
-                addr.addr.a4 = inet_rsk(req)->ir_rmt_addr;
-                hash = (__force unsigned int) addr.addr.a4;
+                saddr.addr.a4 = inet_rsk(req)->ir_loc_addr;
+                daddr.addr.a4 = inet_rsk(req)->ir_rmt_addr;
+                hash = (__force unsigned int) daddr.addr.a4;
                 break;
 #if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
-                *(struct in6_addr *)addr.addr.a6 = inet_rsk(req)->ir_v6_rmt_addr;
+                *(struct in6_addr *)saddr.addr.a6 = inet_rsk(req)->ir_v6_loc_addr;
+                *(struct in6_addr *)daddr.addr.a6 = inet_rsk(req)->ir_v6_rmt_addr;
                 hash = ipv6_addr_hash(&inet_rsk(req)->ir_v6_rmt_addr);
                 break;
 #endif
@@ -233,7 +241,8 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,
 
         for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
              tm = rcu_dereference(tm->tcpm_next)) {
-                if (addr_same(&tm->tcpm_addr, &addr))
+                if (addr_same(&tm->tcpm_saddr, &saddr) &&
+                    addr_same(&tm->tcpm_daddr, &daddr))
                         break;
         }
         tcpm_check_stamp(tm, dst);
@@ -243,19 +252,22 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,
 static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock *tw)
 {
         struct tcp_metrics_block *tm;
-        struct inetpeer_addr addr;
+        struct inetpeer_addr saddr, daddr;
         unsigned int hash;
         struct net *net;
 
-        addr.family = tw->tw_family;
-        switch (addr.family) {
+        saddr.family = tw->tw_family;
+        daddr.family = tw->tw_family;
+        switch (daddr.family) {
         case AF_INET:
-                addr.addr.a4 = tw->tw_daddr;
-                hash = (__force unsigned int) addr.addr.a4;
+                saddr.addr.a4 = tw->tw_rcv_saddr;
+                daddr.addr.a4 = tw->tw_daddr;
+                hash = (__force unsigned int) daddr.addr.a4;
                 break;
 #if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
-                *(struct in6_addr *)addr.addr.a6 = tw->tw_v6_daddr;
+                *(struct in6_addr *)saddr.addr.a6 = tw->tw_v6_rcv_saddr;
+                *(struct in6_addr *)daddr.addr.a6 = tw->tw_v6_daddr;
                 hash = ipv6_addr_hash(&tw->tw_v6_daddr);
                 break;
 #endif
@@ -268,7 +280,8 @@ static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock
 
         for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
              tm = rcu_dereference(tm->tcpm_next)) {
-                if (addr_same(&tm->tcpm_addr, &addr))
+                if (addr_same(&tm->tcpm_saddr, &saddr) &&
+                    addr_same(&tm->tcpm_daddr, &daddr))
                         break;
         }
         return tm;
@@ -279,20 +292,23 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,
                                                  bool create)
 {
         struct tcp_metrics_block *tm;
-        struct inetpeer_addr addr;
+        struct inetpeer_addr saddr, daddr;
         unsigned int hash;
         struct net *net;
         bool reclaim;
 
-        addr.family = sk->sk_family;
-        switch (addr.family) {
+        saddr.family = sk->sk_family;
+        daddr.family = sk->sk_family;
+        switch (daddr.family) {
         case AF_INET:
-                addr.addr.a4 = inet_sk(sk)->inet_daddr;
-                hash = (__force unsigned int) addr.addr.a4;
+                saddr.addr.a4 = inet_sk(sk)->inet_saddr;
+                daddr.addr.a4 = inet_sk(sk)->inet_daddr;
+                hash = (__force unsigned int) daddr.addr.a4;
                 break;
 #if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
-                *(struct in6_addr *)addr.addr.a6 = sk->sk_v6_daddr;
+                *(struct in6_addr *)saddr.addr.a6 = sk->sk_v6_rcv_saddr;
+                *(struct in6_addr *)daddr.addr.a6 = sk->sk_v6_daddr;
                 hash = ipv6_addr_hash(&sk->sk_v6_daddr);
                 break;
 #endif
@@ -303,14 +319,14 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,
         net = dev_net(dst->dev);
         hash = hash_32(hash, net->ipv4.tcp_metrics_hash_log);
 
-        tm = __tcp_get_metrics(&addr, net, hash);
+        tm = __tcp_get_metrics(&saddr, &daddr, net, hash);
         reclaim = false;
         if (tm == TCP_METRICS_RECLAIM_PTR) {
                 reclaim = true;
                 tm = NULL;
         }
         if (!tm && create)
-                tm = tcpm_new(dst, &addr, hash, reclaim);
+                tm = tcpm_new(dst, &saddr, &daddr, hash, reclaim);
         else
                 tcpm_check_stamp(tm, dst);
 
@@ -724,15 +740,21 @@ static int tcp_metrics_fill_info(struct sk_buff *msg,
         struct nlattr *nest;
         int i;
 
-        switch (tm->tcpm_addr.family) {
+        switch (tm->tcpm_daddr.family) {
         case AF_INET:
                 if (nla_put_be32(msg, TCP_METRICS_ATTR_ADDR_IPV4,
-                                tm->tcpm_addr.addr.a4) < 0)
+                                tm->tcpm_daddr.addr.a4) < 0)
+                        goto nla_put_failure;
+                if (nla_put_be32(msg, TCP_METRICS_ATTR_SADDR_IPV4,
+                                tm->tcpm_saddr.addr.a4) < 0)
                         goto nla_put_failure;
                 break;
         case AF_INET6:
                 if (nla_put(msg, TCP_METRICS_ATTR_ADDR_IPV6, 16,
-                            tm->tcpm_addr.addr.a6) < 0)
+                            tm->tcpm_daddr.addr.a6) < 0)
+                        goto nla_put_failure;
+                if (nla_put(msg, TCP_METRICS_ATTR_SADDR_IPV6, 16,
+                            tm->tcpm_saddr.addr.a6) < 0)
                         goto nla_put_failure;
                 break;
         default:
@@ -855,44 +877,66 @@ done:
         return skb->len;
 }
 
-static int parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,
-                         unsigned int *hash, int optional)
+static int __parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,
+                           unsigned int *hash, int optional, int v4, int v6)
 {
         struct nlattr *a;
 
-        a = info->attrs[TCP_METRICS_ATTR_ADDR_IPV4];
+        a = info->attrs[v4];
         if (a) {
                 addr->family = AF_INET;
                 addr->addr.a4 = nla_get_be32(a);
-                *hash = (__force unsigned int) addr->addr.a4;
+                if (hash)
+                        *hash = (__force unsigned int) addr->addr.a4;
                 return 0;
         }
-        a = info->attrs[TCP_METRICS_ATTR_ADDR_IPV6];
+        a = info->attrs[v6];
         if (a) {
                 if (nla_len(a) != sizeof(struct in6_addr))
                         return -EINVAL;
                 addr->family = AF_INET6;
                 memcpy(addr->addr.a6, nla_data(a), sizeof(addr->addr.a6));
-                *hash = ipv6_addr_hash((struct in6_addr *) addr->addr.a6);
+                if (hash)
+                        *hash = ipv6_addr_hash((struct in6_addr *) addr->addr.a6);
                 return 0;
         }
         return optional ? 1 : -EAFNOSUPPORT;
 }
 
+static int parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr,
+                         unsigned int *hash, int optional)
+{
+        return __parse_nl_addr(info, addr, hash, optional,
+                               TCP_METRICS_ATTR_ADDR_IPV4,
+                               TCP_METRICS_ATTR_ADDR_IPV6);
+}
+
+static int parse_nl_saddr(struct genl_info *info, struct inetpeer_addr *addr)
+{
+        return __parse_nl_addr(info, addr, NULL, 0,
+                               TCP_METRICS_ATTR_SADDR_IPV4,
+                               TCP_METRICS_ATTR_SADDR_IPV6);
+}
+
 static int tcp_metrics_nl_cmd_get(struct sk_buff *skb, struct genl_info *info)
 {
         struct tcp_metrics_block *tm;
-        struct inetpeer_addr addr;
+        struct inetpeer_addr saddr, daddr;
         unsigned int hash;
         struct sk_buff *msg;
         struct net *net = genl_info_net(info);
         void *reply;
         int ret;
+        bool src = true;
 
-        ret = parse_nl_addr(info, &addr, &hash, 0);
+        ret = parse_nl_addr(info, &daddr, &hash, 0);
         if (ret < 0)
                 return ret;
 
+        ret = parse_nl_saddr(info, &saddr);
+        if (ret < 0)
+                src = false;
+
         msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return -ENOMEM;
@@ -907,7 +951,8 @@ static int tcp_metrics_nl_cmd_get(struct sk_buff *skb, struct genl_info *info)
         rcu_read_lock();
         for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
              tm = rcu_dereference(tm->tcpm_next)) {
-                if (addr_same(&tm->tcpm_addr, &addr)) {
+                if (addr_same(&tm->tcpm_daddr, &daddr) &&
+                    (!src || addr_same(&tm->tcpm_saddr, &saddr))) {
                         ret = tcp_metrics_fill_info(msg, tm);
                         break;
                 }
@@ -960,34 +1005,44 @@ static int tcp_metrics_flush_all(struct net *net)
 static int tcp_metrics_nl_cmd_del(struct sk_buff *skb, struct genl_info *info)
 {
         struct tcpm_hash_bucket *hb;
-        struct tcp_metrics_block *tm;
+        struct tcp_metrics_block *tm, *tmlist = NULL;
         struct tcp_metrics_block __rcu **pp;
-        struct inetpeer_addr addr;
+        struct inetpeer_addr saddr, daddr;
         unsigned int hash;
         struct net *net = genl_info_net(info);
         int ret;
+        bool src = true;
 
-        ret = parse_nl_addr(info, &addr, &hash, 1);
+        ret = parse_nl_addr(info, &daddr, &hash, 1);
         if (ret < 0)
                 return ret;
         if (ret > 0)
                 return tcp_metrics_flush_all(net);
+        ret = parse_nl_saddr(info, &saddr);
+        if (ret < 0)
+                src = false;
 
         hash = hash_32(hash, net->ipv4.tcp_metrics_hash_log);
         hb = net->ipv4.tcp_metrics_hash + hash;
         pp = &hb->chain;
         spin_lock_bh(&tcp_metrics_lock);
-        for (tm = deref_locked_genl(*pp); tm;
-             pp = &tm->tcpm_next, tm = deref_locked_genl(*pp)) {
-                if (addr_same(&tm->tcpm_addr, &addr)) {
+        for (tm = deref_locked_genl(*pp); tm; tm = deref_locked_genl(*pp)) {
+                if (addr_same(&tm->tcpm_daddr, &daddr) &&
+                    (!src || addr_same(&tm->tcpm_saddr, &saddr))) {
                         *pp = tm->tcpm_next;
-                        break;
+                        tm->tcpm_next = tmlist;
+                        tmlist = tm;
+                } else {
+                        pp = &tm->tcpm_next;
                 }
         }
         spin_unlock_bh(&tcp_metrics_lock);
-        if (!tm)
+        if (!tmlist)
                 return -ESRCH;
-        kfree_rcu(tm, rcu_head);
+        for (tm = tmlist; tm; tm = tmlist) {
+                tmlist = tm->tcpm_next;
+                kfree_rcu(tm, rcu_head);
+        }
         return 0;
 }
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 31f75ea9cb60..a9fa6c1feed5 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1822,6 +1822,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
                 return addrconf_ifid_sit(eui, dev);
         case ARPHRD_IPGRE:
                 return addrconf_ifid_gre(eui, dev);
+        case ARPHRD_6LOWPAN:
         case ARPHRD_IEEE802154:
                 return addrconf_ifid_eui64(eui, dev);
         case ARPHRD_IEEE1394:
@@ -2677,7 +2678,8 @@ static void addrconf_dev_config(struct net_device *dev)
             (dev->type != ARPHRD_INFINIBAND) &&
             (dev->type != ARPHRD_IEEE802154) &&
             (dev->type != ARPHRD_IEEE1394) &&
-            (dev->type != ARPHRD_TUNNEL6)) {
+            (dev->type != ARPHRD_TUNNEL6) &&
+            (dev->type != ARPHRD_6LOWPAN)) {
                 /* Alas, we support only Ethernet autoconfiguration. */
                 return;
         }
diff --git a/net/ipv6/netfilter/nf_tables_ipv6.c b/net/ipv6/netfilter/nf_tables_ipv6.c
index d77db8a13505..0d812b31277d 100644
--- a/net/ipv6/netfilter/nf_tables_ipv6.c
+++ b/net/ipv6/netfilter/nf_tables_ipv6.c
@@ -16,34 +16,51 @@
 #include <net/netfilter/nf_tables.h>
 #include <net/netfilter/nf_tables_ipv6.h>
 
+static unsigned int nft_do_chain_ipv6(const struct nf_hook_ops *ops,
+                                      struct sk_buff *skb,
+                                      const struct net_device *in,
+                                      const struct net_device *out,
+                                      int (*okfn)(struct sk_buff *))
+{
+        struct nft_pktinfo pkt;
+
+        /* malformed packet, drop it */
+        if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0)
+                return NF_DROP;
+
+        return nft_do_chain(&pkt, ops);
+}
+
 static unsigned int nft_ipv6_output(const struct nf_hook_ops *ops,
                                     struct sk_buff *skb,
                                     const struct net_device *in,
                                     const struct net_device *out,
                                     int (*okfn)(struct sk_buff *))
 {
-        struct nft_pktinfo pkt;
-
         if (unlikely(skb->len < sizeof(struct ipv6hdr))) {
                 if (net_ratelimit())
                         pr_info("nf_tables_ipv6: ignoring short SOCK_RAW "
                                 "packet\n");
                 return NF_ACCEPT;
         }
-        if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0)
-                return NF_DROP;
 
-        return nft_do_chain_pktinfo(&pkt, ops);
+        return nft_do_chain_ipv6(ops, skb, in, out, okfn);
 }
 
-static struct nft_af_info nft_af_ipv6 __read_mostly = {
+struct nft_af_info nft_af_ipv6 __read_mostly = {
         .family         = NFPROTO_IPV6,
         .nhooks         = NF_INET_NUMHOOKS,
         .owner          = THIS_MODULE,
+        .nops           = 1,
         .hooks          = {
+                [NF_INET_LOCAL_IN]      = nft_do_chain_ipv6,
                 [NF_INET_LOCAL_OUT]     = nft_ipv6_output,
+                [NF_INET_FORWARD]       = nft_do_chain_ipv6,
+                [NF_INET_PRE_ROUTING]   = nft_do_chain_ipv6,
+                [NF_INET_POST_ROUTING]  = nft_do_chain_ipv6,
         },
 };
+EXPORT_SYMBOL_GPL(nft_af_ipv6);
 
 static int nf_tables_ipv6_init_net(struct net *net)
 {
@@ -73,44 +90,28 @@ static struct pernet_operations nf_tables_ipv6_net_ops = {
         .exit   = nf_tables_ipv6_exit_net,
 };
 
-static unsigned int
-nft_do_chain_ipv6(const struct nf_hook_ops *ops,
-                  struct sk_buff *skb,
-                  const struct net_device *in,
-                  const struct net_device *out,
-                  int (*okfn)(struct sk_buff *))
-{
-        struct nft_pktinfo pkt;
-
-        /* malformed packet, drop it */
-        if (nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out) < 0)
-                return NF_DROP;
-
-        return nft_do_chain_pktinfo(&pkt, ops);
-}
-
-static struct nf_chain_type filter_ipv6 = {
-        .family         = NFPROTO_IPV6,
+static const struct nf_chain_type filter_ipv6 = {
         .name           = "filter",
         .type           = NFT_CHAIN_T_DEFAULT,
+        .family         = NFPROTO_IPV6,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_LOCAL_IN) |
                           (1 << NF_INET_LOCAL_OUT) |
                           (1 << NF_INET_FORWARD) |
                           (1 << NF_INET_PRE_ROUTING) |
                           (1 << NF_INET_POST_ROUTING),
-        .fn             = {
-                [NF_INET_LOCAL_IN]      = nft_do_chain_ipv6,
-                [NF_INET_LOCAL_OUT]     = nft_ipv6_output,
-                [NF_INET_FORWARD]       = nft_do_chain_ipv6,
-                [NF_INET_PRE_ROUTING]   = nft_do_chain_ipv6,
-                [NF_INET_POST_ROUTING]  = nft_do_chain_ipv6,
-        },
 };
 
 static int __init nf_tables_ipv6_init(void)
 {
+        int ret;
+
         nft_register_chain_type(&filter_ipv6);
-        return register_pernet_subsys(&nf_tables_ipv6_net_ops);
+        ret = register_pernet_subsys(&nf_tables_ipv6_net_ops);
+        if (ret < 0)
+                nft_unregister_chain_type(&filter_ipv6);
+
+        return ret;
 }
 
 static void __exit nf_tables_ipv6_exit(void)
diff --git a/net/ipv6/netfilter/nft_chain_nat_ipv6.c b/net/ipv6/netfilter/nft_chain_nat_ipv6.c
index e86dcd70dc76..9c3297a768fd 100644
--- a/net/ipv6/netfilter/nft_chain_nat_ipv6.c
+++ b/net/ipv6/netfilter/nft_chain_nat_ipv6.c
@@ -79,7 +79,7 @@ static unsigned int nf_nat_ipv6_fn(const struct nf_hook_ops *ops,
 
                 nft_set_pktinfo_ipv6(&pkt, ops, skb, in, out);
 
-                ret = nft_do_chain_pktinfo(&pkt, ops);
+                ret = nft_do_chain(&pkt, ops);
                 if (ret != NF_ACCEPT)
                         return ret;
                 if (!nf_nat_initialized(ct, maniptype)) {
@@ -170,21 +170,21 @@ static unsigned int nf_nat_ipv6_output(const struct nf_hook_ops *ops,
         return ret;
 }
 
-static struct nf_chain_type nft_chain_nat_ipv6 = {
-        .family         = NFPROTO_IPV6,
+static const struct nf_chain_type nft_chain_nat_ipv6 = {
         .name           = "nat",
         .type           = NFT_CHAIN_T_NAT,
+        .family         = NFPROTO_IPV6,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_PRE_ROUTING) |
                           (1 << NF_INET_POST_ROUTING) |
                           (1 << NF_INET_LOCAL_OUT) |
                           (1 << NF_INET_LOCAL_IN),
-        .fn             = {
+        .hooks          = {
                 [NF_INET_PRE_ROUTING]   = nf_nat_ipv6_prerouting,
                 [NF_INET_POST_ROUTING]  = nf_nat_ipv6_postrouting,
                 [NF_INET_LOCAL_OUT]     = nf_nat_ipv6_output,
                 [NF_INET_LOCAL_IN]      = nf_nat_ipv6_fn,
         },
-        .me             = THIS_MODULE,
 };
 
 static int __init nft_chain_nat_ipv6_init(void)
diff --git a/net/ipv6/netfilter/nft_chain_route_ipv6.c b/net/ipv6/netfilter/nft_chain_route_ipv6.c
index 3fe40f0456ad..42031299585e 100644
--- a/net/ipv6/netfilter/nft_chain_route_ipv6.c
+++ b/net/ipv6/netfilter/nft_chain_route_ipv6.c
@@ -47,7 +47,7 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
         /* flowlabel and prio (includes version, which shouldn't change either */
         flowlabel = *((u32 *)ipv6_hdr(skb));
 
-        ret = nft_do_chain_pktinfo(&pkt, ops);
+        ret = nft_do_chain(&pkt, ops);
         if (ret != NF_DROP && ret != NF_QUEUE &&
             (memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) ||
              memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
@@ -59,15 +59,15 @@ static unsigned int nf_route_table_hook(const struct nf_hook_ops *ops,
         return ret;
 }
 
-static struct nf_chain_type nft_chain_route_ipv6 = {
-        .family         = NFPROTO_IPV6,
+static const struct nf_chain_type nft_chain_route_ipv6 = {
         .name           = "route",
         .type           = NFT_CHAIN_T_ROUTE,
+        .family         = NFPROTO_IPV6,
+        .owner          = THIS_MODULE,
         .hook_mask      = (1 << NF_INET_LOCAL_OUT),
-        .fn             = {
+        .hooks          = {
                 [NF_INET_LOCAL_OUT]     = nf_route_table_hook,
         },
-        .me             = THIS_MODULE,
 };
 
 static int __init nft_chain_route_init(void)
diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c
index 537488cbf941..9b9009f99551 100644
--- a/net/mac80211/aes_cmac.c
+++ b/net/mac80211/aes_cmac.c
@@ -111,7 +111,7 @@ void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad,
 }
 
 
-struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[])
+struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[])
 {
         struct crypto_cipher *tfm;
 
diff --git a/net/mac80211/aes_cmac.h b/net/mac80211/aes_cmac.h
index 20785a647254..0ce6487af795 100644
--- a/net/mac80211/aes_cmac.h
+++ b/net/mac80211/aes_cmac.h
@@ -11,7 +11,7 @@
 
 #include <linux/crypto.h>
 
-struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[]);
+struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[]);
 void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad,
                         const u8 *data, size_t data_len, u8 *mic);
 void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ac185286842d..09d2e58a2ba7 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -828,6 +828,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
         if (cfg80211_chandef_identical(&local->monitor_chandef, chandef))
                 return 0;
 
+        mutex_lock(&local->mtx);
         mutex_lock(&local->iflist_mtx);
         if (local->use_chanctx) {
                 sdata = rcu_dereference_protected(
@@ -846,6 +847,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
         if (ret == 0)
                 local->monitor_chandef = *chandef;
         mutex_unlock(&local->iflist_mtx);
+        mutex_unlock(&local->mtx);
 
         return ret;
 }
@@ -951,6 +953,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
                               struct cfg80211_ap_settings *params)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct beacon_data *old;
         struct ieee80211_sub_if_data *vlan;
         u32 changed = BSS_CHANGED_BEACON_INT |
@@ -969,8 +972,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
         sdata->needed_rx_chains = sdata->local->rx_chains;
         sdata->radar_required = params->radar_required;
 
+        mutex_lock(&local->mtx);
         err = ieee80211_vif_use_channel(sdata, &params->chandef,
                                         IEEE80211_CHANCTX_SHARED);
+        mutex_unlock(&local->mtx);
         if (err)
                 return err;
         ieee80211_vif_copy_chanctx_to_vlans(sdata, false);
@@ -1121,7 +1126,9 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
         skb_queue_purge(&sdata->u.ap.ps.bc_buf);
 
         ieee80211_vif_copy_chanctx_to_vlans(sdata, true);
+        mutex_lock(&local->mtx);
         ieee80211_vif_release_channel(sdata);
+        mutex_unlock(&local->mtx);
 
         return 0;
 }
@@ -1944,8 +1951,10 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,
         sdata->smps_mode = IEEE80211_SMPS_OFF;
         sdata->needed_rx_chains = sdata->local->rx_chains;
 
+        mutex_lock(&sdata->local->mtx);
         err = ieee80211_vif_use_channel(sdata, &setup->chandef,
                                         IEEE80211_CHANCTX_SHARED);
+        mutex_unlock(&sdata->local->mtx);
         if (err)
                 return err;
 
@@ -1957,7 +1966,9 @@ static int ieee80211_leave_mesh(struct wiphy *wiphy, struct net_device *dev)
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
         ieee80211_stop_mesh(sdata);
+        mutex_lock(&sdata->local->mtx);
         ieee80211_vif_release_channel(sdata);
+        mutex_unlock(&sdata->local->mtx);
 
         return 0;
 }
@@ -2895,26 +2906,29 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy,
         unsigned long timeout;
         int err;
 
-        if (!list_empty(&local->roc_list) || local->scanning)
-                return -EBUSY;
+        mutex_lock(&local->mtx);
+        if (!list_empty(&local->roc_list) || local->scanning) {
+                err = -EBUSY;
+                goto out_unlock;
+        }
 
         /* whatever, but channel contexts should not complain about that one */
         sdata->smps_mode = IEEE80211_SMPS_OFF;
         sdata->needed_rx_chains = local->rx_chains;
         sdata->radar_required = true;
 
-        mutex_lock(&local->iflist_mtx);
         err = ieee80211_vif_use_channel(sdata, chandef,
                                         IEEE80211_CHANCTX_SHARED);
-        mutex_unlock(&local->iflist_mtx);
         if (err)
-                return err;
+                goto out_unlock;
 
         timeout = msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS);
         ieee80211_queue_delayed_work(&sdata->local->hw,
                                      &sdata->dfs_cac_timer_work, timeout);
 
-        return 0;
+ out_unlock:
+        mutex_unlock(&local->mtx);
+        return err;
 }
 
 static struct cfg80211_beacon_data *
@@ -2990,7 +3004,9 @@ void ieee80211_csa_finalize_work(struct work_struct *work)
                 goto unlock;
 
         sdata->radar_required = sdata->csa_radar_required;
+        mutex_lock(&local->mtx);
         err = ieee80211_vif_change_channel(sdata, &changed);
+        mutex_unlock(&local->mtx);
         if (WARN_ON(err < 0))
                 goto unlock;
 
@@ -3821,6 +3837,31 @@ static void ieee80211_set_wakeup(struct wiphy *wiphy, bool enabled)
 }
 #endif
 
+static int ieee80211_set_qos_map(struct wiphy *wiphy,
+                                 struct net_device *dev,
+                                 struct cfg80211_qos_map *qos_map)
+{
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct mac80211_qos_map *new_qos_map, *old_qos_map;
+
+        if (qos_map) {
+                new_qos_map = kzalloc(sizeof(*new_qos_map), GFP_KERNEL);
+                if (!new_qos_map)
+                        return -ENOMEM;
+                memcpy(&new_qos_map->qos_map, qos_map, sizeof(*qos_map));
+        } else {
+                /* A NULL qos_map was passed to disable QoS mapping */
+                new_qos_map = NULL;
+        }
+
+        old_qos_map = rtnl_dereference(sdata->qos_map);
+        rcu_assign_pointer(sdata->qos_map, new_qos_map);
+        if (old_qos_map)
+                kfree_rcu(old_qos_map, rcu_head);
+
+        return 0;
+}
+
 struct cfg80211_ops mac80211_config_ops = {
         .add_virtual_intf = ieee80211_add_iface,
         .del_virtual_intf = ieee80211_del_iface,
@@ -3900,4 +3941,5 @@ struct cfg80211_ops mac80211_config_ops = {
         .get_channel = ieee80211_cfg_get_channel,
         .start_radar_detection = ieee80211_start_radar_detection,
         .channel_switch = ieee80211_channel_switch,
+        .set_qos_map = ieee80211_set_qos_map,
 };
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index a57d5d9466bc..f43613a97dd6 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -232,8 +232,8 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
         if (!local->use_chanctx)
                 local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
 
-        /* acquire mutex to prevent idle from changing */
-        mutex_lock(&local->mtx);
+        /* we hold the mutex to prevent idle from changing */
+        lockdep_assert_held(&local->mtx);
         /* turn idle off *before* setting channel -- some drivers need that */
         changed = ieee80211_idle_off(local);
         if (changed)
@@ -246,19 +246,14 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
                 err = drv_add_chanctx(local, ctx);
                 if (err) {
                         kfree(ctx);
-                        ctx = ERR_PTR(err);
-
                         ieee80211_recalc_idle(local);
-                        goto out;
+                        return ERR_PTR(err);
                 }
         }
 
         /* and keep the mutex held until the new chanctx is on the list */
         list_add_rcu(&ctx->list, &local->chanctx_list);
 
- out:
-        mutex_unlock(&local->mtx);
-
         return ctx;
 }
 
@@ -294,9 +289,7 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
         /* throw a warning if this wasn't the only channel context. */
         WARN_ON(check_single_channel && !list_empty(&local->chanctx_list));
 
-        mutex_lock(&local->mtx);
         ieee80211_recalc_idle(local);
-        mutex_unlock(&local->mtx);
 }
 
 static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
@@ -358,6 +351,31 @@ static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,
         ieee80211_change_chanctx(local, ctx, compat);
 }
 
+static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
+                                           struct ieee80211_chanctx *chanctx)
+{
+        bool radar_enabled;
+
+        lockdep_assert_held(&local->chanctx_mtx);
+        /* for setting local->radar_detect_enabled */
+        lockdep_assert_held(&local->mtx);
+
+        radar_enabled = ieee80211_is_radar_required(local);
+
+        if (radar_enabled == chanctx->conf.radar_enabled)
+                return;
+
+        chanctx->conf.radar_enabled = radar_enabled;
+        local->radar_detect_enabled = chanctx->conf.radar_enabled;
+
+        if (!local->use_chanctx) {
+                local->hw.conf.radar_enabled = chanctx->conf.radar_enabled;
+                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+        }
+
+        drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RADAR);
+}
+
 static void ieee80211_unassign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
                                            struct ieee80211_chanctx *ctx)
 {
@@ -404,29 +422,6 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
                 ieee80211_free_chanctx(local, ctx);
 }
 
-void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
-                                    struct ieee80211_chanctx *chanctx)
-{
-        bool radar_enabled;
-
-        lockdep_assert_held(&local->chanctx_mtx);
-
-        radar_enabled = ieee80211_is_radar_required(local);
-
-        if (radar_enabled == chanctx->conf.radar_enabled)
-                return;
-
-        chanctx->conf.radar_enabled = radar_enabled;
-        local->radar_detect_enabled = chanctx->conf.radar_enabled;
-
-        if (!local->use_chanctx) {
-                local->hw.conf.radar_enabled = chanctx->conf.radar_enabled;
-                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
-        }
-
-        drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RADAR);
-}
-
 void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
                                    struct ieee80211_chanctx *chanctx)
 {
@@ -518,6 +513,8 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_chanctx *ctx;
         int ret;
 
+        lockdep_assert_held(&local->mtx);
+
         WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
 
         mutex_lock(&local->chanctx_mtx);
@@ -558,6 +555,8 @@ int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
         int ret;
         u32 chanctx_changed = 0;
 
+        lockdep_assert_held(&local->mtx);
+
         /* should never be called if not performing a channel switch. */
         if (WARN_ON(!sdata->vif.csa_active))
                 return -EINVAL;
@@ -655,6 +654,8 @@ void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
 {
         WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
 
+        lockdep_assert_held(&sdata->local->mtx);
+
         mutex_lock(&sdata->local->chanctx_mtx);
         __ieee80211_vif_release_channel(sdata);
         mutex_unlock(&sdata->local->chanctx_mtx);
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index d6ba841437b6..771080ec7212 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -293,14 +293,17 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                 radar_required = true;
         }
 
+        mutex_lock(&local->mtx);
         ieee80211_vif_release_channel(sdata);
         if (ieee80211_vif_use_channel(sdata, &chandef,
                                       ifibss->fixed_channel ?
                                         IEEE80211_CHANCTX_SHARED :
                                         IEEE80211_CHANCTX_EXCLUSIVE)) {
                 sdata_info(sdata, "Failed to join IBSS, no channel context\n");
+                mutex_unlock(&local->mtx);
                 return;
         }
+        mutex_unlock(&local->mtx);
 
         memcpy(ifibss->bssid, bssid, ETH_ALEN);
 
@@ -363,7 +366,9 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                 sdata->vif.bss_conf.ssid_len = 0;
                 RCU_INIT_POINTER(ifibss->presp, NULL);
                 kfree_rcu(presp, rcu_head);
+                mutex_lock(&local->mtx);
                 ieee80211_vif_release_channel(sdata);
+                mutex_unlock(&local->mtx);
                 sdata_info(sdata, "Failed to join IBSS, driver failure: %d\n",
                            err);
                 return;
@@ -747,7 +752,9 @@ static void ieee80211_ibss_disconnect(struct ieee80211_sub_if_data *sdata)
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
                                                 BSS_CHANGED_IBSS);
         drv_leave_ibss(local, sdata);
+        mutex_lock(&local->mtx);
         ieee80211_vif_release_channel(sdata);
+        mutex_unlock(&local->mtx);
 }
 
 static void ieee80211_csa_connection_drop_work(struct work_struct *work)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index fb5dbcb79a12..953b9e294547 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -246,7 +246,8 @@ struct ps_data {
         /* yes, this looks ugly, but guarantees that we can later use
          * bitmap_empty :)
          * NB: don't touch this bitmap, use sta_info_{set,clear}_tim_bit */
-        u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)];
+        u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)]
+                        __aligned(__alignof__(unsigned long));
         struct sk_buff_head bc_buf;
         atomic_t num_sta_ps; /* number of stations in PS mode */
         int dtim_count;
@@ -693,6 +694,11 @@ struct ieee80211_chanctx {
         struct ieee80211_chanctx_conf conf;
 };
 
+struct mac80211_qos_map {
+        struct cfg80211_qos_map qos_map;
+        struct rcu_head rcu_head;
+};
+
 struct ieee80211_sub_if_data {
         struct list_head list;
 
@@ -738,6 +744,7 @@ struct ieee80211_sub_if_data {
         int encrypt_headroom;
 
         struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];
+        struct mac80211_qos_map __rcu *qos_map;
 
         struct work_struct csa_finalize_work;
         int csa_counter_offset_beacon;
@@ -1775,8 +1782,6 @@ void ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
 
 void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
                                    struct ieee80211_chanctx *chanctx);
-void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
-                                    struct ieee80211_chanctx *chanctx);
 void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,
                                       struct ieee80211_chanctx *ctx);
 
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d624ed49a7d9..b2c83c0f06d0 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -418,8 +418,10 @@ int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
                 return ret;
         }
 
+        mutex_lock(&local->mtx);
         ret = ieee80211_vif_use_channel(sdata, &local->monitor_chandef,
                                         IEEE80211_CHANCTX_EXCLUSIVE);
+        mutex_unlock(&local->mtx);
         if (ret) {
                 drv_remove_interface(local, sdata);
                 kfree(sdata);
@@ -456,7 +458,9 @@ void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
 
         synchronize_net();
 
+        mutex_lock(&local->mtx);
         ieee80211_vif_release_channel(sdata);
+        mutex_unlock(&local->mtx);
 
         drv_remove_interface(local, sdata);
 
@@ -826,9 +830,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         if (sdata->wdev.cac_started) {
                 chandef = sdata->vif.bss_conf.chandef;
                 WARN_ON(local->suspended);
-                mutex_lock(&local->iflist_mtx);
+                mutex_lock(&local->mtx);
                 ieee80211_vif_release_channel(sdata);
-                mutex_unlock(&local->iflist_mtx);
+                mutex_unlock(&local->mtx);
                 cfg80211_cac_event(sdata->dev, &chandef,
                                    NL80211_RADAR_CAC_ABORTED,
                                    GFP_KERNEL);
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9c2c7ee2cc30..fc1d82465b3c 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -888,7 +888,9 @@ static void ieee80211_chswitch_work(struct work_struct *work)
         if (!ifmgd->associated)
                 goto out;
 
+        mutex_lock(&local->mtx);
         ret = ieee80211_vif_change_channel(sdata, &changed);
+        mutex_unlock(&local->mtx);
         if (ret) {
                 sdata_info(sdata,
                            "vif channel switch failed, disconnecting\n");
@@ -1401,10 +1403,14 @@ void ieee80211_dfs_cac_timer_work(struct work_struct *work)
                              dfs_cac_timer_work);
         struct cfg80211_chan_def chandef = sdata->vif.bss_conf.chandef;
 
-        ieee80211_vif_release_channel(sdata);
-        cfg80211_cac_event(sdata->dev, &chandef,
-                           NL80211_RADAR_CAC_FINISHED,
-                           GFP_KERNEL);
+        mutex_lock(&sdata->local->mtx);
+        if (sdata->wdev.cac_started) {
+                ieee80211_vif_release_channel(sdata);
+                cfg80211_cac_event(sdata->dev, &chandef,
+                                   NL80211_RADAR_CAC_FINISHED,
+                                   GFP_KERNEL);
+        }
+        mutex_unlock(&sdata->local->mtx);
 }
 
 /* MLME */
@@ -1747,7 +1753,9 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         ifmgd->have_beacon = false;
 
         ifmgd->flags = 0;
+        mutex_lock(&local->mtx);
         ieee80211_vif_release_channel(sdata);
+        mutex_unlock(&local->mtx);
 
         sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;
 }
@@ -2070,7 +2078,9 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata,
                 memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
                 sdata->u.mgd.flags = 0;
+                mutex_lock(&sdata->local->mtx);
                 ieee80211_vif_release_channel(sdata);
+                mutex_unlock(&sdata->local->mtx);
         }
 
         cfg80211_put_bss(sdata->local->hw.wiphy, auth_data->bss);
@@ -2319,7 +2329,9 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,
                 memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
                 sdata->u.mgd.flags = 0;
+                mutex_lock(&sdata->local->mtx);
                 ieee80211_vif_release_channel(sdata);
+                mutex_unlock(&sdata->local->mtx);
         }
 
         kfree(assoc_data);
@@ -3670,6 +3682,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
         /* will change later if needed */
         sdata->smps_mode = IEEE80211_SMPS_OFF;
 
+        mutex_lock(&local->mtx);
         /*
          * If this fails (possibly due to channel context sharing
          * on incompatible channels, e.g. 80+80 and 160 sharing the
@@ -3681,13 +3694,15 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
         /* don't downgrade for 5 and 10 MHz channels, though. */
         if (chandef.width == NL80211_CHAN_WIDTH_5 ||
             chandef.width == NL80211_CHAN_WIDTH_10)
-                return ret;
+                goto out;
 
         while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
                 ifmgd->flags |= ieee80211_chandef_downgrade(&chandef);
                 ret = ieee80211_vif_use_channel(sdata, &chandef,
                                                 IEEE80211_CHANCTX_SHARED);
         }
+ out:
+        mutex_unlock(&local->mtx);
         return ret;
 }
 
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index d2f19f7e7091..f3d88b0c054c 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -135,7 +135,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
         u32 usecs;
         int i;
 
-        for (i=0; i < MAX_THR_RATES; i++)
+        for (i = 0; i < MAX_THR_RATES; i++)
             tmp_tp_rate[i] = 0;
 
         for (i = 0; i < mi->n_rates; i++) {
@@ -190,7 +190,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
                  * choose the maximum throughput rate as max_prob_rate
                  * (2) if all success probabilities < 95%, the rate with
                  * highest success probability is choosen as max_prob_rate */
-                if (mr->probability >= MINSTREL_FRAC(95,100)) {
+                if (mr->probability >= MINSTREL_FRAC(95, 100)) {
                         if (mr->cur_tp >= mi->r[tmp_prob_rate].cur_tp)
                                 tmp_prob_rate = i;
                 } else {
@@ -220,7 +220,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
 
 static void
 minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
-                   struct ieee80211_sta *sta, void *priv_sta,
+                   struct ieee80211_sta *sta, void *priv_sta,
                    struct sk_buff *skb)
 {
         struct minstrel_priv *mp = priv;
@@ -260,7 +260,7 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
 
 static inline unsigned int
 minstrel_get_retry_count(struct minstrel_rate *mr,
-                         struct ieee80211_tx_info *info)
+                         struct ieee80211_tx_info *info)
 {
         unsigned int retry = mr->adjusted_retry_count;
 
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index d2ed18d82fe1..c1b5b73c5b91 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -63,7 +63,7 @@
 
 #define CCK_DURATION(_bitrate, _short, _len)            \
         (1000 * (10 /* SIFS */ +                        \
-         (_short ? 72 + 24 : 144 + 48 ) +               \
+         (_short ? 72 + 24 : 144 + 48) +                \
          (8 * (_len + 4) * 10) / (_bitrate)))
 
 #define CCK_ACK_DURATION(_bitrate, _short)                      \
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 124b1fdc20d0..0ae207771a58 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -186,7 +186,7 @@ void ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *keyconf,
 EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv);
 
 void ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf,
-                               const u8 *ta, u32 iv32, u16 *p1k)
+                               const u8 *ta, u32 iv32, u16 *p1k)
 {
         const u8 *tk = &keyconf->key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
         struct tkip_ctx ctx;
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 3a669d7ec7ad..da9366632f37 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -553,7 +553,7 @@ TRACE_EVENT(drv_update_tkip_key,
 
         TP_printk(
                 LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " iv32:%#x",
-                LOCAL_PR_ARG,VIF_PR_ARG,STA_PR_ARG, __entry->iv32
+                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->iv32
         )
 );
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2f0e176e7989..377cf974d97d 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2161,7 +2161,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
         if (ieee80211_is_data_qos(fc)) {
                 __le16 *qos_control;
 
-                qos_control = (__le16*) skb_push(skb, 2);
+                qos_control = (__le16 *) skb_push(skb, 2);
                 memcpy(skb_push(skb, hdrlen - 2), &hdr, hdrlen - 2);
                 /*
                  * Maybe we could actually set some fields here, for now just
@@ -2323,7 +2323,7 @@ static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
         if (atomic_read(&ps->num_sta_ps) > 0)
                 /* in the hope that this is faster than
                  * checking byte-for-byte */
-                have_bits = !bitmap_empty((unsigned long*)ps->tim,
+                have_bits = !bitmap_empty((unsigned long *)ps->tim,
                                           IEEE80211_MAX_AID+1);
 
         if (ps->dtim_count == 0)
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 591b46b72462..df00f1978a77 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -76,7 +76,7 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
         }
 
         if (ieee80211_is_ctl(fc)) {
-                if(ieee80211_is_pspoll(fc))
+                if (ieee80211_is_pspoll(fc))
                         return hdr->addr1;
 
                 if (ieee80211_is_back_req(fc)) {
@@ -2315,9 +2315,14 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
         struct ieee80211_sub_if_data *sdata;
         struct cfg80211_chan_def chandef;
 
+        mutex_lock(&local->mtx);
         mutex_lock(&local->iflist_mtx);
         list_for_each_entry(sdata, &local->interfaces, list) {
-                cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
+                /* it might be waiting for the local->mtx, but then
+                 * by the time it gets it, sdata->wdev.cac_started
+                 * will no longer be true
+                 */
+                cancel_delayed_work(&sdata->dfs_cac_timer_work);
 
                 if (sdata->wdev.cac_started) {
                         chandef = sdata->vif.bss_conf.chandef;
@@ -2329,6 +2334,7 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
                 }
         }
         mutex_unlock(&local->iflist_mtx);
+        mutex_unlock(&local->mtx);
 }
 
 void ieee80211_dfs_radar_detected_work(struct work_struct *work)
@@ -2588,3 +2594,143 @@ int ieee80211_cs_headroom(struct ieee80211_local *local,
 
         return headroom;
 }
+
+static bool
+ieee80211_extend_noa_desc(struct ieee80211_noa_data *data, u32 tsf, int i)
+{
+        s32 end = data->desc[i].start + data->desc[i].duration - (tsf + 1);
+        int skip;
+
+        if (end > 0)
+                return false;
+
+        /* End time is in the past, check for repetitions */
+        skip = DIV_ROUND_UP(-end, data->desc[i].interval);
+        if (data->count[i] < 255) {
+                if (data->count[i] <= skip) {
+                        data->count[i] = 0;
+                        return false;
+                }
+
+                data->count[i] -= skip;
+        }
+
+        data->desc[i].start += skip * data->desc[i].interval;
+
+        return true;
+}
+
+static bool
+ieee80211_extend_absent_time(struct ieee80211_noa_data *data, u32 tsf,
+                             s32 *offset)
+{
+        bool ret = false;
+        int i;
+
+        for (i = 0; i < IEEE80211_P2P_NOA_DESC_MAX; i++) {
+                s32 cur;
+
+                if (!data->count[i])
+                        continue;
+
+                if (ieee80211_extend_noa_desc(data, tsf + *offset, i))
+                        ret = true;
+
+                cur = data->desc[i].start - tsf;
+                if (cur > *offset)
+                        continue;
+
+                cur = data->desc[i].start + data->desc[i].duration - tsf;
+                if (cur > *offset)
+                        *offset = cur;
+        }
+
+        return ret;
+}
+
+static u32
+ieee80211_get_noa_absent_time(struct ieee80211_noa_data *data, u32 tsf)
+{
+        s32 offset = 0;
+        int tries = 0;
+        /*
+         * arbitrary limit, used to avoid infinite loops when combined NoA
+         * descriptors cover the full time period.
+         */
+        int max_tries = 5;
+
+        ieee80211_extend_absent_time(data, tsf, &offset);
+        do {
+                if (!ieee80211_extend_absent_time(data, tsf, &offset))
+                        break;
+
+                tries++;
+        } while (tries < max_tries);
+
+        return offset;
+}
+
+void ieee80211_update_p2p_noa(struct ieee80211_noa_data *data, u32 tsf)
+{
+        u32 next_offset = BIT(31) - 1;
+        int i;
+
+        data->absent = 0;
+        data->has_next_tsf = false;
+        for (i = 0; i < IEEE80211_P2P_NOA_DESC_MAX; i++) {
+                s32 start;
+
+                if (!data->count[i])
+                        continue;
+
+                ieee80211_extend_noa_desc(data, tsf, i);
+                start = data->desc[i].start - tsf;
+                if (start <= 0)
+                        data->absent |= BIT(i);
+
+                if (next_offset > start)
+                        next_offset = start;
+
+                data->has_next_tsf = true;
+        }
+
+        if (data->absent)
+                next_offset = ieee80211_get_noa_absent_time(data, tsf);
+
+        data->next_tsf = tsf + next_offset;
+}
+EXPORT_SYMBOL(ieee80211_update_p2p_noa);
+
+int ieee80211_parse_p2p_noa(const struct ieee80211_p2p_noa_attr *attr,
+                            struct ieee80211_noa_data *data, u32 tsf)
+{
+        int ret = 0;
+        int i;
+
+        memset(data, 0, sizeof(*data));
+
+        for (i = 0; i < IEEE80211_P2P_NOA_DESC_MAX; i++) {
+                const struct ieee80211_p2p_noa_desc *desc = &attr->desc[i];
+
+                if (!desc->count || !desc->duration)
+                        continue;
+
+                data->count[i] = desc->count;
+                data->desc[i].start = le32_to_cpu(desc->start_time);
+                data->desc[i].duration = le32_to_cpu(desc->duration);
+                data->desc[i].interval = le32_to_cpu(desc->interval);
+
+                if (data->count[i] > 1 &&
+                    data->desc[i].interval < data->desc[i].duration)
+                        continue;
+
+                ieee80211_extend_noa_desc(data, tsf, i);
+                ret++;
+        }
+
+        if (ret)
+                ieee80211_update_p2p_noa(data, tsf);
+
+        return ret;
+}
+EXPORT_SYMBOL(ieee80211_parse_p2p_noa);
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index afba19cb6f87..21211c60ca98 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -106,6 +106,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
         struct sta_info *sta = NULL;
         const u8 *ra = NULL;
         bool qos = false;
+        struct mac80211_qos_map *qos_map;
 
         if (local->hw.queues < IEEE80211_NUM_ACS || skb->len < 6) {
                 skb->priority = 0; /* required for correct WPA/11i MIC */
@@ -155,7 +156,11 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 
         /* use the data classifier to determine what 802.1d tag the
          * data frame has */
-        skb->priority = cfg80211_classify8021d(skb);
+        rcu_read_lock();
+        qos_map = rcu_dereference(sdata->qos_map);
+        skb->priority = cfg80211_classify8021d(skb, qos_map ?
+                                               &qos_map->qos_map : NULL);
+        rcu_read_unlock();
 
         return ieee80211_downgrade_queue(sdata, skb);
 }
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index c3b3b26c4c4e..afe50c0f526f 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -428,6 +428,14 @@ config NF_TABLES
 
           To compile it as a module, choose M here.
 
+config NF_TABLES_INET
+        depends on NF_TABLES
+        select NF_TABLES_IPV4
+        select NF_TABLES_IPV6
+        tristate "Netfilter nf_tables mixed IPv4/IPv6 tables support"
+        help
+          This option enables support for a mixed IPv4/IPv6 "inet" table.
+
 config NFT_EXTHDR
         depends on NF_TABLES
         tristate "Netfilter nf_tables IPv6 exthdr module"
@@ -1131,6 +1139,16 @@ config NETFILTER_XT_MATCH_IPVS
 
           If unsure, say N.
 
+config NETFILTER_XT_MATCH_L2TP
+        tristate '"l2tp" match support'
+        depends on NETFILTER_ADVANCED
+        default L2TP
+        ---help---
+        This option adds an "L2TP" match, which allows you to match against
+        L2TP protocol header fields.
+
+        To compile it as a module, choose M here. If unsure, say N.
+
 config NETFILTER_XT_MATCH_LENGTH
         tristate '"length" match support'
         depends on NETFILTER_ADVANCED
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 78b4e1c9c595..ee9c4de5f8ed 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -70,6 +70,7 @@ nf_tables-objs += nft_immediate.o nft_cmp.o nft_lookup.o
 nf_tables-objs += nft_bitwise.o nft_byteorder.o nft_payload.o
 
 obj-$(CONFIG_NF_TABLES)         += nf_tables.o
+obj-$(CONFIG_NF_TABLES_INET)    += nf_tables_inet.o
 obj-$(CONFIG_NFT_COMPAT)        += nft_compat.o
 obj-$(CONFIG_NFT_EXTHDR)        += nft_exthdr.o
 obj-$(CONFIG_NFT_META)          += nft_meta.o
@@ -137,6 +138,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_IPCOMP) += xt_ipcomp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_L2TP) += xt_l2tp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += xt_limit.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_MAC) += xt_mac.o
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index a99b6c3427b0..cb372f96f10d 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
         const char *msg;
         u_int8_t state;
 
-        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
+        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
         BUG_ON(dh == NULL);
 
         state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
 out_invalid:
         if (LOG_INVALID(net, IPPROTO_DCCP))
                 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
-                              NULL, msg);
+                              NULL, "%s", msg);
         return false;
 }
 
@@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
         u_int8_t type, old_state, new_state;
         enum ct_dccp_roles role;
 
-        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
+        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
         BUG_ON(dh == NULL);
         type = dh->dccph_type;
 
@@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
         unsigned int cscov;
         const char *msg;
 
-        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
+        dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
         if (dh == NULL) {
                 msg = "nf_ct_dccp: short packet ";
                 goto out_invalid;
@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
 
 out_invalid:
         if (LOG_INVALID(net, IPPROTO_DCCP))
-                nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
+                nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
         return -NF_ACCEPT;
 }
 
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 1fcef1ec1dc1..36add31e08e7 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -124,37 +124,43 @@ static inline u64 nf_tables_alloc_handle(struct nft_table *table)
         return ++table->hgenerator;
 }
 
-static struct nf_chain_type *chain_type[AF_MAX][NFT_CHAIN_T_MAX];
+static const struct nf_chain_type *chain_type[AF_MAX][NFT_CHAIN_T_MAX];
 
-static int __nf_tables_chain_type_lookup(int family, const struct nlattr *nla)
+static const struct nf_chain_type *
+__nf_tables_chain_type_lookup(int family, const struct nlattr *nla)
 {
         int i;
 
-        for (i=0; i<NFT_CHAIN_T_MAX; i++) {
+        for (i = 0; i < NFT_CHAIN_T_MAX; i++) {
                 if (chain_type[family][i] != NULL &&
                     !nla_strcmp(nla, chain_type[family][i]->name))
-                        return i;
+                        return chain_type[family][i];
         }
-        return -1;
+        return NULL;
 }
 
-static int nf_tables_chain_type_lookup(const struct nft_af_info *afi,
-                                       const struct nlattr *nla,
-                                       bool autoload)
+static const struct nf_chain_type *
+nf_tables_chain_type_lookup(const struct nft_af_info *afi,
+                            const struct nlattr *nla,
+                            bool autoload)
 {
-        int type;
+        const struct nf_chain_type *type;
 
         type = __nf_tables_chain_type_lookup(afi->family, nla);
+        if (type != NULL)
+                return type;
 #ifdef CONFIG_MODULES
-        if (type < 0 && autoload) {
+        if (autoload) {
                 nfnl_unlock(NFNL_SUBSYS_NFTABLES);
                 request_module("nft-chain-%u-%*.s", afi->family,
                                nla_len(nla)-1, (const char *)nla_data(nla));
                 nfnl_lock(NFNL_SUBSYS_NFTABLES);
                 type = __nf_tables_chain_type_lookup(afi->family, nla);
+                if (type != NULL)
+                        return ERR_PTR(-EAGAIN);
         }
 #endif
-        return type;
+        return ERR_PTR(-ENOENT);
 }
 
 static const struct nla_policy nft_table_policy[NFTA_TABLE_MAX + 1] = {
@@ -307,7 +313,8 @@ err:
         return err;
 }
 
-static int nf_tables_table_enable(struct nft_table *table)
+static int nf_tables_table_enable(const struct nft_af_info *afi,
+                                  struct nft_table *table)
 {
         struct nft_chain *chain;
         int err, i = 0;
@@ -316,7 +323,7 @@ static int nf_tables_table_enable(struct nft_table *table)
                 if (!(chain->flags & NFT_BASE_CHAIN))
                         continue;
 
-                err = nf_register_hook(&nft_base_chain(chain)->ops);
+                err = nf_register_hooks(nft_base_chain(chain)->ops, afi->nops);
                 if (err < 0)
                         goto err;
 
@@ -331,18 +338,20 @@ err:
                 if (i-- <= 0)
                         break;
 
-                nf_unregister_hook(&nft_base_chain(chain)->ops);
+                nf_unregister_hooks(nft_base_chain(chain)->ops, afi->nops);
         }
         return err;
 }
 
-static int nf_tables_table_disable(struct nft_table *table)
+static int nf_tables_table_disable(const struct nft_af_info *afi,
+                                   struct nft_table *table)
 {
         struct nft_chain *chain;
 
         list_for_each_entry(chain, &table->chains, list) {
                 if (chain->flags & NFT_BASE_CHAIN)
-                        nf_unregister_hook(&nft_base_chain(chain)->ops);
+                        nf_unregister_hooks(nft_base_chain(chain)->ops,
+                                            afi->nops);
         }
 
         return 0;
@@ -357,7 +366,7 @@ static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb,
         int family = nfmsg->nfgen_family, ret = 0;
 
         if (nla[NFTA_TABLE_FLAGS]) {
-                __be32 flags;
+                u32 flags;
 
                 flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
                 if (flags & ~NFT_TABLE_F_DORMANT)
@@ -365,12 +374,12 @@ static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb,
 
                 if ((flags & NFT_TABLE_F_DORMANT) &&
                     !(table->flags & NFT_TABLE_F_DORMANT)) {
-                        ret = nf_tables_table_disable(table);
+                        ret = nf_tables_table_disable(afi, table);
                         if (ret >= 0)
                                 table->flags |= NFT_TABLE_F_DORMANT;
                 } else if (!(flags & NFT_TABLE_F_DORMANT) &&
                            table->flags & NFT_TABLE_F_DORMANT) {
-                        ret = nf_tables_table_enable(table);
+                        ret = nf_tables_table_enable(afi, table);
                         if (ret >= 0)
                                 table->flags &= ~NFT_TABLE_F_DORMANT;
                 }
@@ -393,6 +402,7 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
         struct nft_table *table;
         struct net *net = sock_net(skb->sk);
         int family = nfmsg->nfgen_family;
+        u32 flags = 0;
 
         afi = nf_tables_afinfo_lookup(net, family, true);
         if (IS_ERR(afi))
@@ -414,25 +424,25 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
                 return nf_tables_updtable(nlsk, skb, nlh, nla, afi, table);
         }
 
+        if (nla[NFTA_TABLE_FLAGS]) {
+                flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
+                if (flags & ~NFT_TABLE_F_DORMANT)
+                        return -EINVAL;
+        }
+
+        if (!try_module_get(afi->owner))
+                return -EAFNOSUPPORT;
+
         table = kzalloc(sizeof(*table) + nla_len(name), GFP_KERNEL);
-        if (table == NULL)
+        if (table == NULL) {
+                module_put(afi->owner);
                 return -ENOMEM;
+        }
 
         nla_strlcpy(table->name, name, nla_len(name));
         INIT_LIST_HEAD(&table->chains);
         INIT_LIST_HEAD(&table->sets);
-
-        if (nla[NFTA_TABLE_FLAGS]) {
-                __be32 flags;
-
-                flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
-                if (flags & ~NFT_TABLE_F_DORMANT) {
-                        kfree(table);
-                        return -EINVAL;
-                }
-
-                table->flags |= flags;
-        }
+        table->flags = flags;
 
         list_add_tail(&table->list, &afi->tables);
         nf_tables_table_notify(skb, nlh, table, NFT_MSG_NEWTABLE, family);
@@ -457,16 +467,17 @@ static int nf_tables_deltable(struct sock *nlsk, struct sk_buff *skb,
         if (IS_ERR(table))
                 return PTR_ERR(table);
 
-        if (table->use)
+        if (!list_empty(&table->chains) || !list_empty(&table->sets))
                 return -EBUSY;
 
         list_del(&table->list);
         nf_tables_table_notify(skb, nlh, table, NFT_MSG_DELTABLE, family);
         kfree(table);
+        module_put(afi->owner);
         return 0;
 }
 
-int nft_register_chain_type(struct nf_chain_type *ctype)
+int nft_register_chain_type(const struct nf_chain_type *ctype)
 {
         int err = 0;
 
@@ -475,10 +486,6 @@ int nft_register_chain_type(struct nf_chain_type *ctype)
                 err = -EBUSY;
                 goto out;
         }
-
-        if (!try_module_get(ctype->me))
-                goto out;
-
         chain_type[ctype->family][ctype->type] = ctype;
 out:
         nfnl_unlock(NFNL_SUBSYS_NFTABLES);
@@ -486,11 +493,10 @@ out:
 }
 EXPORT_SYMBOL_GPL(nft_register_chain_type);
 
-void nft_unregister_chain_type(struct nf_chain_type *ctype)
+void nft_unregister_chain_type(const struct nf_chain_type *ctype)
 {
         nfnl_lock(NFNL_SUBSYS_NFTABLES);
         chain_type[ctype->family][ctype->type] = NULL;
-        module_put(ctype->me);
         nfnl_unlock(NFNL_SUBSYS_NFTABLES);
 }
 EXPORT_SYMBOL_GPL(nft_unregister_chain_type);
@@ -598,7 +604,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, u32 portid, u32 seq,
 
         if (chain->flags & NFT_BASE_CHAIN) {
                 const struct nft_base_chain *basechain = nft_base_chain(chain);
-                const struct nf_hook_ops *ops = &basechain->ops;
+                const struct nf_hook_ops *ops = &basechain->ops[0];
                 struct nlattr *nest;
 
                 nest = nla_nest_start(skb, NFTA_CHAIN_HOOK);
@@ -614,9 +620,8 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, u32 portid, u32 seq,
                                  htonl(basechain->policy)))
                         goto nla_put_failure;
 
-                if (nla_put_string(skb, NFTA_CHAIN_TYPE,
-                        chain_type[ops->pf][nft_base_chain(chain)->type]->name))
-                                goto nla_put_failure;
+                if (nla_put_string(skb, NFTA_CHAIN_TYPE, basechain->type->name))
+                        goto nla_put_failure;
 
                 if (nft_dump_stats(skb, nft_base_chain(chain)->stats))
                         goto nla_put_failure;
@@ -757,22 +762,6 @@ err:
         return err;
 }
 
-static int
-nf_tables_chain_policy(struct nft_base_chain *chain, const struct nlattr *attr)
-{
-        switch (ntohl(nla_get_be32(attr))) {
-        case NF_DROP:
-                chain->policy = NF_DROP;
-                break;
-        case NF_ACCEPT:
-                chain->policy = NF_ACCEPT;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
 static const struct nla_policy nft_counter_policy[NFTA_COUNTER_MAX + 1] = {
         [NFTA_COUNTER_PACKETS]  = { .type = NLA_U64 },
         [NFTA_COUNTER_BYTES]    = { .type = NLA_U64 },
@@ -831,7 +820,9 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
         struct nlattr *ha[NFTA_HOOK_MAX + 1];
         struct net *net = sock_net(skb->sk);
         int family = nfmsg->nfgen_family;
+        u8 policy = NF_ACCEPT;
         u64 handle = 0;
+        unsigned int i;
         int err;
         bool create;
 
@@ -845,9 +836,6 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
         if (IS_ERR(table))
                 return PTR_ERR(table);
 
-        if (table->use == UINT_MAX)
-                return -EOVERFLOW;
-
         chain = NULL;
         name = nla[NFTA_CHAIN_NAME];
 
@@ -865,6 +853,22 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
                 }
         }
 
+        if (nla[NFTA_CHAIN_POLICY]) {
+                if ((chain != NULL &&
+                    !(chain->flags & NFT_BASE_CHAIN)) ||
+                    nla[NFTA_CHAIN_HOOK] == NULL)
+                        return -EOPNOTSUPP;
+
+                policy = nla_get_be32(nla[NFTA_CHAIN_POLICY]);
+                switch (policy) {
+                case NF_DROP:
+                case NF_ACCEPT:
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        }
+
         if (chain != NULL) {
                 if (nlh->nlmsg_flags & NLM_F_EXCL)
                         return -EEXIST;
@@ -875,16 +879,6 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
                     !IS_ERR(nf_tables_chain_lookup(table, nla[NFTA_CHAIN_NAME])))
                         return -EEXIST;
 
-                if (nla[NFTA_CHAIN_POLICY]) {
-                        if (!(chain->flags & NFT_BASE_CHAIN))
-                                return -EOPNOTSUPP;
-
-                        err = nf_tables_chain_policy(nft_base_chain(chain),
-                                                     nla[NFTA_CHAIN_POLICY]);
-                        if (err < 0)
-                                return err;
-                }
-
                 if (nla[NFTA_CHAIN_COUNTERS]) {
                         if (!(chain->flags & NFT_BASE_CHAIN))
                                 return -EOPNOTSUPP;
@@ -895,24 +889,31 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
                                 return err;
                 }
 
+                if (nla[NFTA_CHAIN_POLICY])
+                        nft_base_chain(chain)->policy = policy;
+
                 if (nla[NFTA_CHAIN_HANDLE] && name)
                         nla_strlcpy(chain->name, name, NFT_CHAIN_MAXNAMELEN);
 
                 goto notify;
         }
 
+        if (table->use == UINT_MAX)
+                return -EOVERFLOW;
+
         if (nla[NFTA_CHAIN_HOOK]) {
+                const struct nf_chain_type *type;
                 struct nf_hook_ops *ops;
                 nf_hookfn *hookfn;
-                u32 hooknum;
-                int type = NFT_CHAIN_T_DEFAULT;
+                u32 hooknum, priority;
 
+                type = chain_type[family][NFT_CHAIN_T_DEFAULT];
                 if (nla[NFTA_CHAIN_TYPE]) {
                         type = nf_tables_chain_type_lookup(afi,
                                                            nla[NFTA_CHAIN_TYPE],
                                                            create);
-                        if (type < 0)
-                                return -ENOENT;
+                        if (IS_ERR(type))
+                                return PTR_ERR(type);
                 }
 
                 err = nla_parse_nested(ha, NFTA_HOOK_MAX, nla[NFTA_CHAIN_HOOK],
@@ -926,46 +927,23 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
                 hooknum = ntohl(nla_get_be32(ha[NFTA_HOOK_HOOKNUM]));
                 if (hooknum >= afi->nhooks)
                         return -EINVAL;
+                priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));
 
-                hookfn = chain_type[family][type]->fn[hooknum];
-                if (hookfn == NULL)
+                if (!(type->hook_mask & (1 << hooknum)))
                         return -EOPNOTSUPP;
+                if (!try_module_get(type->owner))
+                        return -ENOENT;
+                hookfn = type->hooks[hooknum];
 
                 basechain = kzalloc(sizeof(*basechain), GFP_KERNEL);
                 if (basechain == NULL)
                         return -ENOMEM;
 
-                basechain->type = type;
-                chain = &basechain->chain;
-
-                ops = &basechain->ops;
-                ops->pf         = family;
-                ops->owner      = afi->owner;
-                ops->hooknum    = ntohl(nla_get_be32(ha[NFTA_HOOK_HOOKNUM]));
-                ops->priority   = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));
-                ops->priv       = chain;
-                ops->hook       = hookfn;
-                if (afi->hooks[ops->hooknum])
-                        ops->hook = afi->hooks[ops->hooknum];
-
-                chain->flags |= NFT_BASE_CHAIN;
-
-                if (nla[NFTA_CHAIN_POLICY]) {
-                        err = nf_tables_chain_policy(basechain,
-                                                     nla[NFTA_CHAIN_POLICY]);
-                        if (err < 0) {
-                                free_percpu(basechain->stats);
-                                kfree(basechain);
-                                return err;
-                        }
-                } else
-                        basechain->policy = NF_ACCEPT;
-
                 if (nla[NFTA_CHAIN_COUNTERS]) {
                         err = nf_tables_counters(basechain,
                                                  nla[NFTA_CHAIN_COUNTERS]);
                         if (err < 0) {
-                                free_percpu(basechain->stats);
+                                module_put(type->owner);
                                 kfree(basechain);
                                 return err;
                         }
@@ -973,12 +951,33 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
                         struct nft_stats __percpu *newstats;
 
                         newstats = alloc_percpu(struct nft_stats);
-                        if (newstats == NULL)
+                        if (newstats == NULL) {
+                                module_put(type->owner);
+                                kfree(basechain);
                                 return -ENOMEM;
+                        }
+                        rcu_assign_pointer(basechain->stats, newstats);
+                }
 
-                        rcu_assign_pointer(nft_base_chain(chain)->stats,
-                                           newstats);
+                basechain->type = type;
+                chain = &basechain->chain;
+
+                for (i = 0; i < afi->nops; i++) {
+                        ops = &basechain->ops[i];
+                        ops->pf         = family;
+                        ops->owner      = afi->owner;
+                        ops->hooknum    = hooknum;
+                        ops->priority   = priority;
+                        ops->priv       = chain;
+                        ops->hook       = afi->hooks[ops->hooknum];
+                        if (hookfn)
+                                ops->hook = hookfn;
+                        if (afi->hook_ops_init)
+                                afi->hook_ops_init(ops, i);
                 }
+
+                chain->flags |= NFT_BASE_CHAIN;
+                basechain->policy = policy;
         } else {
                 chain = kzalloc(sizeof(*chain), GFP_KERNEL);
                 if (chain == NULL)
@@ -993,8 +992,9 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
 
         if (!(table->flags & NFT_TABLE_F_DORMANT) &&
             chain->flags & NFT_BASE_CHAIN) {
-                err = nf_register_hook(&nft_base_chain(chain)->ops);
+                err = nf_register_hooks(nft_base_chain(chain)->ops, afi->nops);
                 if (err < 0) {
+                        module_put(basechain->type->owner);
                         free_percpu(basechain->stats);
                         kfree(basechain);
                         return err;
@@ -1015,6 +1015,7 @@ static void nf_tables_rcu_chain_destroy(struct rcu_head *head)
         BUG_ON(chain->use > 0);
 
         if (chain->flags & NFT_BASE_CHAIN) {
+                module_put(nft_base_chain(chain)->type->owner);
                 free_percpu(nft_base_chain(chain)->stats);
                 kfree(nft_base_chain(chain));
         } else
@@ -1052,7 +1053,7 @@ static int nf_tables_delchain(struct sock *nlsk, struct sk_buff *skb,
 
         if (!(table->flags & NFT_TABLE_F_DORMANT) &&
             chain->flags & NFT_BASE_CHAIN)
-                nf_unregister_hook(&nft_base_chain(chain)->ops);
+                nf_unregister_hooks(nft_base_chain(chain)->ops, afi->nops);
 
         nf_tables_chain_notify(skb, nlh, table, chain, NFT_MSG_DELCHAIN,
                                family);
diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index e8fcc343c2b9..0d879fcb8763 100644
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -109,14 +109,14 @@ static inline void nft_trace_packet(const struct nft_pktinfo *pkt,
 {
         struct net *net = dev_net(pkt->in ? pkt->in : pkt->out);
 
-        nf_log_packet(net, pkt->xt.family, pkt->hooknum, pkt->skb, pkt->in,
+        nf_log_packet(net, pkt->xt.family, pkt->ops->hooknum, pkt->skb, pkt->in,
                       pkt->out, &trace_loginfo, "TRACE: %s:%s:%s:%u ",
                       chain->table->name, chain->name, comments[type],
                       rulenum);
 }
 
 unsigned int
-nft_do_chain_pktinfo(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops)
+nft_do_chain(struct nft_pktinfo *pkt, const struct nf_hook_ops *ops)
 {
         const struct nft_chain *chain = ops->priv;
         const struct nft_rule *rule;
@@ -216,7 +216,7 @@ next_rule:
 
         return nft_base_chain(chain)->policy;
 }
-EXPORT_SYMBOL_GPL(nft_do_chain_pktinfo);
+EXPORT_SYMBOL_GPL(nft_do_chain);
 
 int __init nf_tables_core_module_init(void)
 {
diff --git a/net/netfilter/nf_tables_inet.c b/net/netfilter/nf_tables_inet.c
new file mode 100644
index 000000000000..9dd2d216cfc1
--- /dev/null
+++ b/net/netfilter/nf_tables_inet.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2012-2014 Patrick McHardy <kaber@trash.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/ip.h>
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
+#include <net/netfilter/nf_tables.h>
+#include <net/netfilter/nf_tables_ipv4.h>
+#include <net/netfilter/nf_tables_ipv6.h>
+#include <net/ip.h>
+
+static void nft_inet_hook_ops_init(struct nf_hook_ops *ops, unsigned int n)
+{
+        struct nft_af_info *afi;
+
+        if (n == 1)
+                afi = &nft_af_ipv4;
+        else
+                afi = &nft_af_ipv6;
+
+        ops->pf = afi->family;
+        if (afi->hooks[ops->hooknum])
+                ops->hook = afi->hooks[ops->hooknum];
+}
+
+static struct nft_af_info nft_af_inet __read_mostly = {
+        .family         = NFPROTO_INET,
+        .nhooks         = NF_INET_NUMHOOKS,
+        .owner          = THIS_MODULE,
+        .nops           = 2,
+        .hook_ops_init  = nft_inet_hook_ops_init,
+};
+
+static int __net_init nf_tables_inet_init_net(struct net *net)
+{
+        net->nft.inet = kmalloc(sizeof(struct nft_af_info), GFP_KERNEL);
+        if (net->nft.inet == NULL)
+                return -ENOMEM;
+        memcpy(net->nft.inet, &nft_af_inet, sizeof(nft_af_inet));
+
+        if (nft_register_afinfo(net, net->nft.inet) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        kfree(net->nft.inet);
+        return -ENOMEM;
+}
+
+static void __net_exit nf_tables_inet_exit_net(struct net *net)
+{
+        nft_unregister_afinfo(net->nft.inet);
+        kfree(net->nft.inet);
+}
+
+static struct pernet_operations nf_tables_inet_net_ops = {
+        .init   = nf_tables_inet_init_net,
+        .exit   = nf_tables_inet_exit_net,
+};
+
+static const struct nf_chain_type filter_inet = {
+        .name           = "filter",
+        .type           = NFT_CHAIN_T_DEFAULT,
+        .family         = NFPROTO_INET,
+        .owner          = THIS_MODULE,
+        .hook_mask      = (1 << NF_INET_LOCAL_IN) |
+                          (1 << NF_INET_LOCAL_OUT) |
+                          (1 << NF_INET_FORWARD) |
+                          (1 << NF_INET_PRE_ROUTING) |
+                          (1 << NF_INET_POST_ROUTING),
+};
+
+static int __init nf_tables_inet_init(void)
+{
+        int ret;
+
+        nft_register_chain_type(&filter_inet);
+        ret = register_pernet_subsys(&nf_tables_inet_net_ops);
+        if (ret < 0)
+                nft_unregister_chain_type(&filter_inet);
+
+        return ret;
+}
+
+static void __exit nf_tables_inet_exit(void)
+{
+        unregister_pernet_subsys(&nf_tables_inet_net_ops);
+        nft_unregister_chain_type(&filter_inet);
+}
+
+module_init(nf_tables_inet_init);
+module_exit(nf_tables_inet_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
+MODULE_ALIAS_NFT_FAMILY(1);
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index d292c8d286eb..a155d19a225e 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -28,6 +28,8 @@
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/list.h>
+#include <linux/jhash.h>
+#include <linux/random.h>
 #include <linux/slab.h>
 #include <net/sock.h>
 #include <net/netfilter/nf_log.h>
@@ -73,6 +75,7 @@ struct nfulnl_instance {
 };
 
 #define INSTANCE_BUCKETS        16
+static unsigned int hash_init;
 
 static int nfnl_log_net_id __read_mostly;
 
@@ -1064,6 +1067,11 @@ static int __init nfnetlink_log_init(void)
 {
         int status = -ENOMEM;
 
+        /* it's not really all that important to have a random value, so
+         * we can do this from the init function, even if there hasn't
+         * been that much entropy yet */
+        get_random_bytes(&hash_init, sizeof(hash_init));
+
         netlink_register_notifier(&nfulnl_rtnl_notifier);
         status = nfnetlink_subsys_register(&nfulnl_subsys);
         if (status < 0) {
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index da0c1f4ada12..82cb8236f8a1 100644
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -92,7 +92,7 @@ nft_target_set_tgchk_param(struct xt_tgchk_param *par,
         if (ctx->chain->flags & NFT_BASE_CHAIN) {
                 const struct nft_base_chain *basechain =
                                                 nft_base_chain(ctx->chain);
-                const struct nf_hook_ops *ops = &basechain->ops;
+                const struct nf_hook_ops *ops = &basechain->ops[0];
 
                 par->hook_mask = 1 << ops->hooknum;
         }
@@ -253,7 +253,7 @@ static int nft_target_validate(const struct nft_ctx *ctx,
         if (ctx->chain->flags & NFT_BASE_CHAIN) {
                 const struct nft_base_chain *basechain =
                                                 nft_base_chain(ctx->chain);
-                const struct nf_hook_ops *ops = &basechain->ops;
+                const struct nf_hook_ops *ops = &basechain->ops[0];
 
                 hook_mask = 1 << ops->hooknum;
                 if (hook_mask & target->hooks)
@@ -323,7 +323,7 @@ nft_match_set_mtchk_param(struct xt_mtchk_param *par, const struct nft_ctx *ctx,
         if (ctx->chain->flags & NFT_BASE_CHAIN) {
                 const struct nft_base_chain *basechain =
                                                 nft_base_chain(ctx->chain);
-                const struct nf_hook_ops *ops = &basechain->ops;
+                const struct nf_hook_ops *ops = &basechain->ops[0];
 
                 par->hook_mask = 1 << ops->hooknum;
         }
@@ -449,7 +449,7 @@ static int nft_match_validate(const struct nft_ctx *ctx,
         if (ctx->chain->flags & NFT_BASE_CHAIN) {
                 const struct nft_base_chain *basechain =
                                                 nft_base_chain(ctx->chain);
-                const struct nf_hook_ops *ops = &basechain->ops;
+                const struct nf_hook_ops *ops = &basechain->ops[0];
 
                 hook_mask = 1 << ops->hooknum;
                 if (hook_mask & match->hooks)
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 955f4e6e7089..c7c12858e113 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -18,17 +18,21 @@
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_tuple.h>
 #include <net/netfilter/nf_conntrack_helper.h>
+#include <net/netfilter/nf_conntrack_ecache.h>
 
 struct nft_ct {
         enum nft_ct_keys        key:8;
         enum ip_conntrack_dir   dir:8;
-        enum nft_registers      dreg:8;
+        union{
+                enum nft_registers      dreg:8;
+                enum nft_registers      sreg:8;
+        };
         uint8_t                 family;
 };
 
-static void nft_ct_eval(const struct nft_expr *expr,
-                        struct nft_data data[NFT_REG_MAX + 1],
-                        const struct nft_pktinfo *pkt)
+static void nft_ct_get_eval(const struct nft_expr *expr,
+                            struct nft_data data[NFT_REG_MAX + 1],
+                            const struct nft_pktinfo *pkt)
 {
         const struct nft_ct *priv = nft_expr_priv(expr);
         struct nft_data *dest = &data[priv->dreg];
@@ -123,24 +127,77 @@ err:
         data[NFT_REG_VERDICT].verdict = NFT_BREAK;
 }
 
+static void nft_ct_set_eval(const struct nft_expr *expr,
+                            struct nft_data data[NFT_REG_MAX + 1],
+                            const struct nft_pktinfo *pkt)
+{
+        const struct nft_ct *priv = nft_expr_priv(expr);
+        struct sk_buff *skb = pkt->skb;
+        u32 value = data[priv->sreg].data[0];
+        enum ip_conntrack_info ctinfo;
+        struct nf_conn *ct;
+
+        ct = nf_ct_get(skb, &ctinfo);
+        if (ct == NULL)
+                return;
+
+        switch (priv->key) {
+#ifdef CONFIG_NF_CONNTRACK_MARK
+        case NFT_CT_MARK:
+                if (ct->mark != value) {
+                        ct->mark = value;
+                        nf_conntrack_event_cache(IPCT_MARK, ct);
+                }
+                break;
+#endif
+        }
+}
+
 static const struct nla_policy nft_ct_policy[NFTA_CT_MAX + 1] = {
         [NFTA_CT_DREG]          = { .type = NLA_U32 },
         [NFTA_CT_KEY]           = { .type = NLA_U32 },
         [NFTA_CT_DIRECTION]     = { .type = NLA_U8 },
+        [NFTA_CT_SREG]          = { .type = NLA_U32 },
 };
 
-static int nft_ct_init(const struct nft_ctx *ctx,
-                       const struct nft_expr *expr,
-                       const struct nlattr * const tb[])
+static int nft_ct_l3proto_try_module_get(uint8_t family)
 {
-        struct nft_ct *priv = nft_expr_priv(expr);
         int err;
 
-        if (tb[NFTA_CT_DREG] == NULL ||
-            tb[NFTA_CT_KEY] == NULL)
-                return -EINVAL;
+        if (family == NFPROTO_INET) {
+                err = nf_ct_l3proto_try_module_get(NFPROTO_IPV4);
+                if (err < 0)
+                        goto err1;
+                err = nf_ct_l3proto_try_module_get(NFPROTO_IPV6);
+                if (err < 0)
+                        goto err2;
+        } else {
+                err = nf_ct_l3proto_try_module_get(family);
+                if (err < 0)
+                        goto err1;
+        }
+        return 0;
+
+err2:
+        nf_ct_l3proto_module_put(NFPROTO_IPV4);
+err1:
+        return err;
+}
+
+static void nft_ct_l3proto_module_put(uint8_t family)
+{
+        if (family == NFPROTO_INET) {
+                nf_ct_l3proto_module_put(NFPROTO_IPV4);
+                nf_ct_l3proto_module_put(NFPROTO_IPV6);
+        } else
+                nf_ct_l3proto_module_put(family);
+}
+
+static int nft_ct_init_validate_get(const struct nft_expr *expr,
+                                    const struct nlattr * const tb[])
+{
+        struct nft_ct *priv = nft_expr_priv(expr);
 
-        priv->key = ntohl(nla_get_be32(tb[NFTA_CT_KEY]));
         if (tb[NFTA_CT_DIRECTION] != NULL) {
                 priv->dir = nla_get_u8(tb[NFTA_CT_DIRECTION]);
                 switch (priv->dir) {
@@ -179,34 +236,72 @@ static int nft_ct_init(const struct nft_ctx *ctx,
                 return -EOPNOTSUPP;
         }
 
-        err = nf_ct_l3proto_try_module_get(ctx->afi->family);
+        return 0;
+}
+
+static int nft_ct_init_validate_set(uint32_t key)
+{
+        switch (key) {
+        case NFT_CT_MARK:
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+static int nft_ct_init(const struct nft_ctx *ctx,
+                       const struct nft_expr *expr,
+                       const struct nlattr * const tb[])
+{
+        struct nft_ct *priv = nft_expr_priv(expr);
+        int err;
+
+        priv->key = ntohl(nla_get_be32(tb[NFTA_CT_KEY]));
+
+        if (tb[NFTA_CT_DREG]) {
+                err = nft_ct_init_validate_get(expr, tb);
+                if (err < 0)
+                        return err;
+
+                priv->dreg = ntohl(nla_get_be32(tb[NFTA_CT_DREG]));
+                err = nft_validate_output_register(priv->dreg);
+                if (err < 0)
+                        return err;
+
+                err = nft_validate_data_load(ctx, priv->dreg, NULL,
+                                             NFT_DATA_VALUE);
+                if (err < 0)
+                        return err;
+        } else {
+                err = nft_ct_init_validate_set(priv->key);
+                if (err < 0)
+                        return err;
+
+                priv->sreg = ntohl(nla_get_be32(tb[NFTA_CT_SREG]));
+                err = nft_validate_input_register(priv->sreg);
+                if (err < 0)
+                        return err;
+        }
+
+        err = nft_ct_l3proto_try_module_get(ctx->afi->family);
         if (err < 0)
                 return err;
-        priv->family = ctx->afi->family;
 
-        priv->dreg = ntohl(nla_get_be32(tb[NFTA_CT_DREG]));
-        err = nft_validate_output_register(priv->dreg);
-        if (err < 0)
-                goto err1;
+        priv->family = ctx->afi->family;
 
-        err = nft_validate_data_load(ctx, priv->dreg, NULL, NFT_DATA_VALUE);
-        if (err < 0)
-                goto err1;
         return 0;
-
-err1:
-        nf_ct_l3proto_module_put(ctx->afi->family);
-        return err;
 }
 
 static void nft_ct_destroy(const struct nft_expr *expr)
 {
         struct nft_ct *priv = nft_expr_priv(expr);
 
-        nf_ct_l3proto_module_put(priv->family);
+        nft_ct_l3proto_module_put(priv->family);
 }
 
-static int nft_ct_dump(struct sk_buff *skb, const struct nft_expr *expr)
+static int nft_ct_get_dump(struct sk_buff *skb, const struct nft_expr *expr)
 {
         const struct nft_ct *priv = nft_expr_priv(expr);
 
@@ -222,19 +317,61 @@ nla_put_failure:
         return -1;
 }
 
+static int nft_ct_set_dump(struct sk_buff *skb, const struct nft_expr *expr)
+{
+        const struct nft_ct *priv = nft_expr_priv(expr);
+
+        if (nla_put_be32(skb, NFTA_CT_SREG, htonl(priv->sreg)))
+                goto nla_put_failure;
+        if (nla_put_be32(skb, NFTA_CT_KEY, htonl(priv->key)))
+                goto nla_put_failure;
+        return 0;
+
+nla_put_failure:
+        return -1;
+}
+
 static struct nft_expr_type nft_ct_type;
-static const struct nft_expr_ops nft_ct_ops = {
+static const struct nft_expr_ops nft_ct_get_ops = {
         .type           = &nft_ct_type,
         .size           = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
-        .eval           = nft_ct_eval,
+        .eval           = nft_ct_get_eval,
         .init           = nft_ct_init,
         .destroy        = nft_ct_destroy,
-        .dump           = nft_ct_dump,
+        .dump           = nft_ct_get_dump,
 };
 
+static const struct nft_expr_ops nft_ct_set_ops = {
+        .type           = &nft_ct_type,
+        .size           = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
+        .eval           = nft_ct_set_eval,
+        .init           = nft_ct_init,
+        .destroy        = nft_ct_destroy,
+        .dump           = nft_ct_set_dump,
+};
+
+static const struct nft_expr_ops *
+nft_ct_select_ops(const struct nft_ctx *ctx,
+                    const struct nlattr * const tb[])
+{
+        if (tb[NFTA_CT_KEY] == NULL)
+                return ERR_PTR(-EINVAL);
+
+        if (tb[NFTA_CT_DREG] && tb[NFTA_CT_SREG])
+                return ERR_PTR(-EINVAL);
+
+        if (tb[NFTA_CT_DREG])
+                return &nft_ct_get_ops;
+
+        if (tb[NFTA_CT_SREG])
+                return &nft_ct_set_ops;
+
+        return ERR_PTR(-EINVAL);
+}
+
 static struct nft_expr_type nft_ct_type __read_mostly = {
         .name           = "ct",
-        .ops            = &nft_ct_ops,
+        .select_ops     = &nft_ct_select_ops,
         .policy         = nft_ct_policy,
         .maxattr        = NFTA_CT_MAX,
         .owner          = THIS_MODULE,
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index 6aae699aeb46..3d3f8fce10a5 100644
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -164,7 +164,7 @@ static int nft_hash_init(const struct nft_set *set,
         unsigned int cnt, i;
 
         if (unlikely(!nft_hash_rnd_initted)) {
-                nft_hash_rnd = prandom_u32();
+                get_random_bytes(&nft_hash_rnd, 4);
                 nft_hash_rnd_initted = true;
         }
 
diff --git a/net/netfilter/nft_log.c b/net/netfilter/nft_log.c
index 57cad072a13e..5af790123ad8 100644
--- a/net/netfilter/nft_log.c
+++ b/net/netfilter/nft_log.c
@@ -33,7 +33,7 @@ static void nft_log_eval(const struct nft_expr *expr,
         const struct nft_log *priv = nft_expr_priv(expr);
         struct net *net = dev_net(pkt->in ? pkt->in : pkt->out);
 
-        nf_log_packet(net, priv->family, pkt->hooknum, pkt->skb, pkt->in,
+        nf_log_packet(net, priv->family, pkt->ops->hooknum, pkt->skb, pkt->in,
                       pkt->out, &priv->loginfo, "%s", priv->prefix);
 }
 
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 1ceaaa6dfe72..e8254ad2e5a9 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -43,6 +43,12 @@ static void nft_meta_get_eval(const struct nft_expr *expr,
         case NFT_META_PROTOCOL:
                 *(__be16 *)dest->data = skb->protocol;
                 break;
+        case NFT_META_NFPROTO:
+                dest->data[0] = pkt->ops->pf;
+                break;
+        case NFT_META_L4PROTO:
+                dest->data[0] = pkt->tprot;
+                break;
         case NFT_META_PRIORITY:
                 dest->data[0] = skb->priority;
                 break;
@@ -181,6 +187,8 @@ static int nft_meta_init_validate_get(uint32_t key)
         switch (key) {
         case NFT_META_LEN:
         case NFT_META_PROTOCOL:
+        case NFT_META_NFPROTO:
+        case NFT_META_L4PROTO:
         case NFT_META_PRIORITY:
         case NFT_META_MARK:
         case NFT_META_IIF:
@@ -231,6 +239,9 @@ static int nft_meta_init(const struct nft_ctx *ctx, const struct nft_expr *expr,
                 return err;
 
         priv->sreg = ntohl(nla_get_be32(tb[NFTA_META_SREG]));
+        err = nft_validate_input_register(priv->sreg);
+        if (err < 0)
+                return err;
 
         return 0;
 }
diff --git a/net/netfilter/nft_reject.c b/net/netfilter/nft_reject.c
index 0d690d4101d2..5e204711d704 100644
--- a/net/netfilter/nft_reject.c
+++ b/net/netfilter/nft_reject.c
@@ -34,8 +34,9 @@ static void nft_reject_eval(const struct nft_expr *expr,
                               const struct nft_pktinfo *pkt)
 {
         struct nft_reject *priv = nft_expr_priv(expr);
+#if IS_ENABLED(CONFIG_NF_TABLES_IPV6)
         struct net *net = dev_net((pkt->in != NULL) ? pkt->in : pkt->out);
-
+#endif
         switch (priv->type) {
         case NFT_REJECT_ICMP_UNREACH:
                 if (priv->family == NFPROTO_IPV4)
@@ -43,15 +44,15 @@ static void nft_reject_eval(const struct nft_expr *expr,
 #if IS_ENABLED(CONFIG_NF_TABLES_IPV6)
                 else if (priv->family == NFPROTO_IPV6)
                         nf_send_unreach6(net, pkt->skb, priv->icmp_code,
-                                      pkt->hooknum);
+                                      pkt->ops->hooknum);
 #endif
                 break;
         case NFT_REJECT_TCP_RST:
                 if (priv->family == NFPROTO_IPV4)
-                        nf_send_reset(pkt->skb, pkt->hooknum);
+                        nf_send_reset(pkt->skb, pkt->ops->hooknum);
 #if IS_ENABLED(CONFIG_NF_TABLES_IPV6)
                 else if (priv->family == NFPROTO_IPV6)
-                        nf_send_reset6(net, pkt->skb, pkt->hooknum);
+                        nf_send_reset6(net, pkt->skb, pkt->ops->hooknum);
 #endif
                 break;
         }
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index 190854be7629..370adf622cef 100644
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -100,7 +100,7 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
         int ret;
 
         if (unlikely(!rnd_inited)) {
-                jhash_rnd = prandom_u32();
+                get_random_bytes(&jhash_rnd, sizeof(jhash_rnd));
                 rnd_inited = true;
         }
 
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 7671e8214919..c40b2695633b 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -229,7 +229,7 @@ static int connlimit_mt_check(const struct xt_mtchk_param *par)
                 u_int32_t rand;
 
                 do {
-                        rand = prandom_u32();
+                        get_random_bytes(&rand, sizeof(rand));
                 } while (!rand);
                 cmpxchg(&connlimit_rnd, 0, rand);
         }
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index d819f62b3b7c..a3910fc2122b 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -177,7 +177,7 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,
         /* initialize hash with random val at the time we allocate
          * the first hashtable entry */
         if (unlikely(!ht->rnd_initialized)) {
-                ht->rnd = prandom_u32();
+                get_random_bytes(&ht->rnd, sizeof(ht->rnd));
                 ht->rnd_initialized = true;
         }
 
diff --git a/net/netfilter/xt_l2tp.c b/net/netfilter/xt_l2tp.c
new file mode 100644
index 000000000000..8aee572771f2
--- /dev/null
+++ b/net/netfilter/xt_l2tp.c
@@ -0,0 +1,354 @@
+/* Kernel module to match L2TP header parameters. */
+
+/* (C) 2013      James Chapman <jchapman@katalix.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/if_ether.h>
+#include <net/ip.h>
+#include <linux/ipv6.h>
+#include <net/ipv6.h>
+#include <net/udp.h>
+#include <linux/l2tp.h>
+
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_tcpudp.h>
+#include <linux/netfilter/xt_l2tp.h>
+
+/* L2TP header masks */
+#define L2TP_HDR_T_BIT  0x8000
+#define L2TP_HDR_L_BIT  0x4000
+#define L2TP_HDR_VER    0x000f
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
+MODULE_DESCRIPTION("Xtables: L2TP header match");
+MODULE_ALIAS("ipt_l2tp");
+MODULE_ALIAS("ip6t_l2tp");
+
+/* The L2TP fields that can be matched */
+struct l2tp_data {
+        u32 tid;
+        u32 sid;
+        u8 type;
+        u8 version;
+};
+
+union l2tp_val {
+        __be16 val16[2];
+        __be32 val32;
+};
+
+static bool l2tp_match(const struct xt_l2tp_info *info, struct l2tp_data *data)
+{
+        if ((info->flags & XT_L2TP_TYPE) && (info->type != data->type))
+                return false;
+
+        if ((info->flags & XT_L2TP_VERSION) && (info->version != data->version))
+                return false;
+
+        /* Check tid only for L2TPv3 control or any L2TPv2 packets */
+        if ((info->flags & XT_L2TP_TID) &&
+            ((data->type == XT_L2TP_TYPE_CONTROL) || (data->version == 2)) &&
+            (info->tid != data->tid))
+                return false;
+
+        /* Check sid only for L2TP data packets */
+        if ((info->flags & XT_L2TP_SID) && (data->type == XT_L2TP_TYPE_DATA) &&
+            (info->sid != data->sid))
+                return false;
+
+        return true;
+}
+
+/* Parse L2TP header fields when UDP encapsulation is used. Handles
+ * L2TPv2 and L2TPv3. Note the L2TPv3 control and data packets have a
+ * different format. See
+ * RFC2661, Section 3.1, L2TPv2 Header Format
+ * RFC3931, Section 3.2.1, L2TPv3 Control Message Header
+ * RFC3931, Section 3.2.2, L2TPv3 Data Message Header
+ * RFC3931, Section 4.1.2.1, L2TPv3 Session Header over UDP
+ */
+static bool l2tp_udp_mt(const struct sk_buff *skb, struct xt_action_param *par, u16 thoff)
+{
+        const struct xt_l2tp_info *info = par->matchinfo;
+        int uhlen = sizeof(struct udphdr);
+        int offs = thoff + uhlen;
+        union l2tp_val *lh;
+        union l2tp_val lhbuf;
+        u16 flags;
+        struct l2tp_data data = { 0, };
+
+        if (par->fragoff != 0)
+                return false;
+
+        /* Extract L2TP header fields. The flags in the first 16 bits
+         * tell us where the other fields are.
+         */
+        lh = skb_header_pointer(skb, offs, 2, &lhbuf);
+        if (lh == NULL)
+                return false;
+
+        flags = ntohs(lh->val16[0]);
+        if (flags & L2TP_HDR_T_BIT)
+                data.type = XT_L2TP_TYPE_CONTROL;
+        else
+                data.type = XT_L2TP_TYPE_DATA;
+        data.version = (u8) flags & L2TP_HDR_VER;
+
+        /* Now extract the L2TP tid/sid. These are in different places
+         * for L2TPv2 (rfc2661) and L2TPv3 (rfc3931). For L2TPv2, we
+         * must also check to see if the length field is present,
+         * since this affects the offsets into the packet of the
+         * tid/sid fields.
+         */
+        if (data.version == 3) {
+                lh = skb_header_pointer(skb, offs + 4, 4, &lhbuf);
+                if (lh == NULL)
+                        return false;
+                if (data.type == XT_L2TP_TYPE_CONTROL)
+                        data.tid = ntohl(lh->val32);
+                else
+                        data.sid = ntohl(lh->val32);
+        } else if (data.version == 2) {
+                if (flags & L2TP_HDR_L_BIT)
+                        offs += 2;
+                lh = skb_header_pointer(skb, offs + 2, 4, &lhbuf);
+                if (lh == NULL)
+                        return false;
+                data.tid = (u32) ntohs(lh->val16[0]);
+                data.sid = (u32) ntohs(lh->val16[1]);
+        } else
+                return false;
+
+        return l2tp_match(info, &data);
+}
+
+/* Parse L2TP header fields for IP encapsulation (no UDP header).
+ * L2TPv3 data packets have a different form with IP encap. See
+ * RC3931, Section 4.1.1.1, L2TPv3 Session Header over IP.
+ * RC3931, Section 4.1.1.2, L2TPv3 Control and Data Traffic over IP.
+ */
+static bool l2tp_ip_mt(const struct sk_buff *skb, struct xt_action_param *par, u16 thoff)
+{
+        const struct xt_l2tp_info *info = par->matchinfo;
+        union l2tp_val *lh;
+        union l2tp_val lhbuf;
+        struct l2tp_data data = { 0, };
+
+        /* For IP encap, the L2TP sid is the first 32-bits. */
+        lh = skb_header_pointer(skb, thoff, sizeof(lhbuf), &lhbuf);
+        if (lh == NULL)
+                return false;
+        if (lh->val32 == 0) {
+                /* Must be a control packet. The L2TP tid is further
+                 * into the packet.
+                 */
+                data.type = XT_L2TP_TYPE_CONTROL;
+                lh = skb_header_pointer(skb, thoff + 8, sizeof(lhbuf),
+                                        &lhbuf);
+                if (lh == NULL)
+                        return false;
+                data.tid = ntohl(lh->val32);
+        } else {
+                data.sid = ntohl(lh->val32);
+                data.type = XT_L2TP_TYPE_DATA;
+        }
+
+        data.version = 3;
+
+        return l2tp_match(info, &data);
+}
+
+static bool l2tp_mt4(const struct sk_buff *skb, struct xt_action_param *par)
+{
+        struct iphdr *iph = ip_hdr(skb);
+        u8 ipproto = iph->protocol;
+
+        /* l2tp_mt_check4 already restricts the transport protocol */
+        switch (ipproto) {
+        case IPPROTO_UDP:
+                return l2tp_udp_mt(skb, par, par->thoff);
+        case IPPROTO_L2TP:
+                return l2tp_ip_mt(skb, par, par->thoff);
+        }
+
+        return false;
+}
+
+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
+static bool l2tp_mt6(const struct sk_buff *skb, struct xt_action_param *par)
+{
+        unsigned int thoff = 0;
+        unsigned short fragoff = 0;
+        int ipproto;
+
+        ipproto = ipv6_find_hdr(skb, &thoff, -1, &fragoff, NULL);
+        if (fragoff != 0)
+                return false;
+
+        /* l2tp_mt_check6 already restricts the transport protocol */
+        switch (ipproto) {
+        case IPPROTO_UDP:
+                return l2tp_udp_mt(skb, par, thoff);
+        case IPPROTO_L2TP:
+                return l2tp_ip_mt(skb, par, thoff);
+        }
+
+        return false;
+}
+#endif
+
+static int l2tp_mt_check(const struct xt_mtchk_param *par)
+{
+        const struct xt_l2tp_info *info = par->matchinfo;
+
+        /* Check for invalid flags */
+        if (info->flags & ~(XT_L2TP_TID | XT_L2TP_SID | XT_L2TP_VERSION |
+                            XT_L2TP_TYPE)) {
+                pr_info("unknown flags: %x\n", info->flags);
+                return -EINVAL;
+        }
+
+        /* At least one of tid, sid or type=control must be specified */
+        if ((!(info->flags & XT_L2TP_TID)) &&
+            (!(info->flags & XT_L2TP_SID)) &&
+            ((!(info->flags & XT_L2TP_TYPE)) ||
+             (info->type != XT_L2TP_TYPE_CONTROL))) {
+                pr_info("invalid flags combination: %x\n", info->flags);
+                return -EINVAL;
+        }
+
+        /* If version 2 is specified, check that incompatible params
+         * are not supplied
+         */
+        if (info->flags & XT_L2TP_VERSION) {
+                if ((info->version < 2) || (info->version > 3)) {
+                        pr_info("wrong L2TP version: %u\n", info->version);
+                        return -EINVAL;
+                }
+
+                if (info->version == 2) {
+                        if ((info->flags & XT_L2TP_TID) &&
+                            (info->tid > 0xffff)) {
+                                pr_info("v2 tid > 0xffff: %u\n", info->tid);
+                                return -EINVAL;
+                        }
+                        if ((info->flags & XT_L2TP_SID) &&
+                            (info->sid > 0xffff)) {
+                                pr_info("v2 sid > 0xffff: %u\n", info->sid);
+                                return -EINVAL;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static int l2tp_mt_check4(const struct xt_mtchk_param *par)
+{
+        const struct xt_l2tp_info *info = par->matchinfo;
+        const struct ipt_entry *e = par->entryinfo;
+        const struct ipt_ip *ip = &e->ip;
+        int ret;
+
+        ret = l2tp_mt_check(par);
+        if (ret != 0)
+                return ret;
+
+        if ((ip->proto != IPPROTO_UDP) &&
+            (ip->proto != IPPROTO_L2TP)) {
+                pr_info("missing protocol rule (udp|l2tpip)\n");
+                return -EINVAL;
+        }
+
+        if ((ip->proto == IPPROTO_L2TP) &&
+            (info->version == 2)) {
+                pr_info("v2 doesn't support IP mode\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
+static int l2tp_mt_check6(const struct xt_mtchk_param *par)
+{
+        const struct xt_l2tp_info *info = par->matchinfo;
+        const struct ip6t_entry *e = par->entryinfo;
+        const struct ip6t_ip6 *ip = &e->ipv6;
+        int ret;
+
+        ret = l2tp_mt_check(par);
+        if (ret != 0)
+                return ret;
+
+        if ((ip->proto != IPPROTO_UDP) &&
+            (ip->proto != IPPROTO_L2TP)) {
+                pr_info("missing protocol rule (udp|l2tpip)\n");
+                return -EINVAL;
+        }
+
+        if ((ip->proto == IPPROTO_L2TP) &&
+            (info->version == 2)) {
+                pr_info("v2 doesn't support IP mode\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+#endif
+
+static struct xt_match l2tp_mt_reg[] __read_mostly = {
+        {
+                .name      = "l2tp",
+                .revision  = 0,
+                .family    = NFPROTO_IPV4,
+                .match     = l2tp_mt4,
+                .matchsize = XT_ALIGN(sizeof(struct xt_l2tp_info)),
+                .checkentry = l2tp_mt_check4,
+                .hooks     = ((1 << NF_INET_PRE_ROUTING) |
+                              (1 << NF_INET_LOCAL_IN) |
+                              (1 << NF_INET_LOCAL_OUT) |
+                              (1 << NF_INET_FORWARD)),
+                .me        = THIS_MODULE,
+        },
+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
+        {
+                .name      = "l2tp",
+                .revision  = 0,
+                .family    = NFPROTO_IPV6,
+                .match     = l2tp_mt6,
+                .matchsize = XT_ALIGN(sizeof(struct xt_l2tp_info)),
+                .checkentry = l2tp_mt_check6,
+                .hooks     = ((1 << NF_INET_PRE_ROUTING) |
+                              (1 << NF_INET_LOCAL_IN) |
+                              (1 << NF_INET_LOCAL_OUT) |
+                              (1 << NF_INET_FORWARD)),
+                .me        = THIS_MODULE,
+        },
+#endif
+};
+
+static int __init l2tp_mt_init(void)
+{
+        return xt_register_matches(&l2tp_mt_reg[0], ARRAY_SIZE(l2tp_mt_reg));
+}
+
+static void __exit l2tp_mt_exit(void)
+{
+        xt_unregister_matches(&l2tp_mt_reg[0], ARRAY_SIZE(l2tp_mt_reg));
+}
+
+module_init(l2tp_mt_init);
+module_exit(l2tp_mt_exit);
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index bfdc29f1a04a..1e657cf715c4 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -334,7 +334,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
         size_t sz;
 
         if (unlikely(!hash_rnd_inited)) {
-                hash_rnd = prandom_u32();
+                get_random_bytes(&hash_rnd, sizeof(hash_rnd));
                 hash_rnd_inited = true;
         }
         if (info->check_set & ~XT_RECENT_VALID_FLAGS) {
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index b430d42b2d0f..c58a0fe3c889 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -104,7 +104,7 @@ struct sw_flow *ovs_flow_alloc(bool percpu_stats)
         }
         return flow;
 err:
-        kfree(flow);
+        kmem_cache_free(flow_cache, flow);
         return ERR_PTR(-ENOMEM);
 }
 
diff --git a/net/wireless/ap.c b/net/wireless/ap.c
index 324e8d851dc4..11ee4ed04f73 100644
--- a/net/wireless/ap.c
+++ b/net/wireless/ap.c
@@ -29,6 +29,7 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
                 wdev->beacon_interval = 0;
                 wdev->channel = NULL;
                 wdev->ssid_len = 0;
+                rdev_set_qos_map(rdev, dev, NULL);
         }
 
         return err;
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 730147ed8e65..f911c5f9f903 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -183,6 +183,8 @@ static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)
         kfree(wdev->connect_keys);
         wdev->connect_keys = NULL;
 
+        rdev_set_qos_map(rdev, dev, NULL);
+
         /*
          * Delete all the keys ... pairwise keys can't really
          * exist any more anyway, but default keys might.
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 9c7a11ae7936..885862447b63 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -277,6 +277,7 @@ static int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
         if (!err) {
                 wdev->mesh_id_len = 0;
                 wdev->channel = NULL;
+                rdev_set_qos_map(rdev, dev, NULL);
         }
 
         return err;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 04681a46eda8..b4f40fe84a01 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -53,6 +53,7 @@ enum nl80211_multicast_groups {
         NL80211_MCGRP_SCAN,
         NL80211_MCGRP_REGULATORY,
         NL80211_MCGRP_MLME,
+        NL80211_MCGRP_VENDOR,
         NL80211_MCGRP_TESTMODE /* keep last - ifdef! */
 };
 
@@ -61,6 +62,7 @@ static const struct genl_multicast_group nl80211_mcgrps[] = {
         [NL80211_MCGRP_SCAN] = { .name = "scan", },
         [NL80211_MCGRP_REGULATORY] = { .name = "regulatory", },
         [NL80211_MCGRP_MLME] = { .name = "mlme", },
+        [NL80211_MCGRP_VENDOR] = { .name = "vendor", },
 #ifdef CONFIG_NL80211_TESTMODE
         [NL80211_MCGRP_TESTMODE] = { .name = "testmode", }
 #endif
@@ -380,6 +382,8 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_VENDOR_ID] = { .type = NLA_U32 },
         [NL80211_ATTR_VENDOR_SUBCMD] = { .type = NLA_U32 },
         [NL80211_ATTR_VENDOR_DATA] = { .type = NLA_BINARY },
+        [NL80211_ATTR_QOS_MAP] = { .type = NLA_BINARY,
+                                   .len = IEEE80211_QOS_MAP_LEN_MAX },
 };
 
 /* policy for the key attributes */
@@ -1188,7 +1192,6 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,
         struct nlattr *nl_bands, *nl_band;
         struct nlattr *nl_freqs, *nl_freq;
         struct nlattr *nl_cmds;
-        struct nlattr *nl_vendor_cmds;
         enum ieee80211_band band;
         struct ieee80211_channel *chan;
         int i;
@@ -1455,6 +1458,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,
                         if (dev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)
                                 CMD(channel_switch, CHANNEL_SWITCH);
                 }
+                CMD(set_qos_map, SET_QOS_MAP);
 
 #ifdef CONFIG_NL80211_TESTMODE
                 CMD(testmode_cmd, TESTMODE);
@@ -1587,16 +1591,38 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,
                 state->split_start++;
                 break;
         case 11:
-                nl_vendor_cmds = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
-                if (!nl_vendor_cmds)
-                        goto nla_put_failure;
+                if (dev->wiphy.n_vendor_commands) {
+                        const struct nl80211_vendor_cmd_info *info;
+                        struct nlattr *nested;
+
+                        nested = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
+                        if (!nested)
+                                goto nla_put_failure;
+
+                        for (i = 0; i < dev->wiphy.n_vendor_commands; i++) {
+                                info = &dev->wiphy.vendor_commands[i].info;
+                                if (nla_put(msg, i + 1, sizeof(*info), info))
+                                        goto nla_put_failure;
+                        }
+                        nla_nest_end(msg, nested);
+                }
+
+                if (dev->wiphy.n_vendor_events) {
+                        const struct nl80211_vendor_cmd_info *info;
+                        struct nlattr *nested;
 
-                for (i = 0; i < dev->wiphy.n_vendor_commands; i++)
-                        if (nla_put(msg, i + 1,
-                                    sizeof(struct nl80211_vendor_cmd_info),
-                                    &dev->wiphy.vendor_commands[i].info))
+                        nested = nla_nest_start(msg,
+                                                NL80211_ATTR_VENDOR_EVENTS);
+                        if (!nested)
                                 goto nla_put_failure;
-                nla_nest_end(msg, nl_vendor_cmds);
+
+                        for (i = 0; i < dev->wiphy.n_vendor_events; i++) {
+                                info = &dev->wiphy.vendor_events[i];
+                                if (nla_put(msg, i + 1, sizeof(*info), info))
+                                        goto nla_put_failure;
+                        }
+                        nla_nest_end(msg, nested);
+                }
 
                 /* done */
                 state->split_start = 0;
@@ -6726,7 +6752,9 @@ static struct sk_buff *
 __cfg80211_alloc_vendor_skb(struct cfg80211_registered_device *rdev,
                             int approxlen, u32 portid, u32 seq,
                             enum nl80211_commands cmd,
-                            enum nl80211_attrs attr, gfp_t gfp)
+                            enum nl80211_attrs attr,
+                            const struct nl80211_vendor_cmd_info *info,
+                            gfp_t gfp)
 {
         struct sk_buff *skb;
         void *hdr;
@@ -6744,6 +6772,16 @@ __cfg80211_alloc_vendor_skb(struct cfg80211_registered_device *rdev,
 
         if (nla_put_u32(skb, NL80211_ATTR_WIPHY, rdev->wiphy_idx))
                 goto nla_put_failure;
+
+        if (info) {
+                if (nla_put_u32(skb, NL80211_ATTR_VENDOR_ID,
+                                info->vendor_id))
+                        goto nla_put_failure;
+                if (nla_put_u32(skb, NL80211_ATTR_VENDOR_SUBCMD,
+                                info->subcmd))
+                        goto nla_put_failure;
+        }
+
         data = nla_nest_start(skb, attr);
 
         ((void **)skb->cb)[0] = rdev;
@@ -6884,29 +6922,54 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
         return err;
 }
 
-struct sk_buff *cfg80211_testmode_alloc_event_skb(struct wiphy *wiphy,
-                                                  int approxlen, gfp_t gfp)
+struct sk_buff *__cfg80211_alloc_event_skb(struct wiphy *wiphy,
+                                           enum nl80211_commands cmd,
+                                           enum nl80211_attrs attr,
+                                           int vendor_event_idx,
+                                           int approxlen, gfp_t gfp)
 {
         struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+        const struct nl80211_vendor_cmd_info *info;
+
+        switch (cmd) {
+        case NL80211_CMD_TESTMODE:
+                if (WARN_ON(vendor_event_idx != -1))
+                        return NULL;
+                info = NULL;
+                break;
+        case NL80211_CMD_VENDOR:
+                if (WARN_ON(vendor_event_idx < 0 ||
+                            vendor_event_idx >= wiphy->n_vendor_events))
+                        return NULL;
+                info = &wiphy->vendor_events[vendor_event_idx];
+                break;
+        default:
+                WARN_ON(1);
+                return NULL;
+        }
 
         return __cfg80211_alloc_vendor_skb(rdev, approxlen, 0, 0,
-                                           NL80211_CMD_TESTMODE,
-                                           NL80211_ATTR_TESTDATA, gfp);
+                                           cmd, attr, info, gfp);
 }
-EXPORT_SYMBOL(cfg80211_testmode_alloc_event_skb);
+EXPORT_SYMBOL(__cfg80211_alloc_event_skb);
 
-void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
+void __cfg80211_send_event_skb(struct sk_buff *skb, gfp_t gfp)
 {
         struct cfg80211_registered_device *rdev = ((void **)skb->cb)[0];
         void *hdr = ((void **)skb->cb)[1];
         struct nlattr *data = ((void **)skb->cb)[2];
+        enum nl80211_multicast_groups mcgrp = NL80211_MCGRP_TESTMODE;
 
         nla_nest_end(skb, data);
         genlmsg_end(skb, hdr);
+
+        if (data->nla_type == NL80211_ATTR_VENDOR_DATA)
+                mcgrp = NL80211_MCGRP_VENDOR;
+
         genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), skb, 0,
-                                NL80211_MCGRP_TESTMODE, gfp);
+                                mcgrp, gfp);
 }
-EXPORT_SYMBOL(cfg80211_testmode_event);
+EXPORT_SYMBOL(__cfg80211_send_event_skb);
 #endif
 
 static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
@@ -9039,7 +9102,7 @@ struct sk_buff *__cfg80211_alloc_reply_skb(struct wiphy *wiphy,
         return __cfg80211_alloc_vendor_skb(rdev, approxlen,
                                            rdev->cur_cmd_info->snd_portid,
                                            rdev->cur_cmd_info->snd_seq,
-                                           cmd, attr, GFP_KERNEL);
+                                           cmd, attr, NULL, GFP_KERNEL);
 }
 EXPORT_SYMBOL(__cfg80211_alloc_reply_skb);
 
@@ -9061,6 +9124,57 @@ int cfg80211_vendor_cmd_reply(struct sk_buff *skb)
 EXPORT_SYMBOL_GPL(cfg80211_vendor_cmd_reply);
 
 
+static int nl80211_set_qos_map(struct sk_buff *skb,
+                               struct genl_info *info)
+{
+        struct cfg80211_registered_device *rdev = info->user_ptr[0];
+        struct cfg80211_qos_map *qos_map = NULL;
+        struct net_device *dev = info->user_ptr[1];
+        u8 *pos, len, num_des, des_len, des;
+        int ret;
+
+        if (!rdev->ops->set_qos_map)
+                return -EOPNOTSUPP;
+
+        if (info->attrs[NL80211_ATTR_QOS_MAP]) {
+                pos = nla_data(info->attrs[NL80211_ATTR_QOS_MAP]);
+                len = nla_len(info->attrs[NL80211_ATTR_QOS_MAP]);
+
+                if (len % 2 || len < IEEE80211_QOS_MAP_LEN_MIN ||
+                    len > IEEE80211_QOS_MAP_LEN_MAX)
+                        return -EINVAL;
+
+                qos_map = kzalloc(sizeof(struct cfg80211_qos_map), GFP_KERNEL);
+                if (!qos_map)
+                        return -ENOMEM;
+
+                num_des = (len - IEEE80211_QOS_MAP_LEN_MIN) >> 1;
+                if (num_des) {
+                        des_len = num_des *
+                                sizeof(struct cfg80211_dscp_exception);
+                        memcpy(qos_map->dscp_exception, pos, des_len);
+                        qos_map->num_des = num_des;
+                        for (des = 0; des < num_des; des++) {
+                                if (qos_map->dscp_exception[des].up > 7) {
+                                        kfree(qos_map);
+                                        return -EINVAL;
+                                }
+                        }
+                        pos += des_len;
+                }
+                memcpy(qos_map->up, pos, IEEE80211_QOS_MAP_LEN_MIN);
+        }
+
+        wdev_lock(dev->ieee80211_ptr);
+        ret = nl80211_key_allowed(dev->ieee80211_ptr);
+        if (!ret)
+                ret = rdev_set_qos_map(rdev, dev, qos_map);
+        wdev_unlock(dev->ieee80211_ptr);
+
+        kfree(qos_map);
+        return ret;
+}
+
 #define NL80211_FLAG_NEED_WIPHY         0x01
 #define NL80211_FLAG_NEED_NETDEV        0x02
 #define NL80211_FLAG_NEED_RTNL          0x04
@@ -9793,6 +9907,14 @@ static const struct genl_ops nl80211_ops[] = {
                 .internal_flags = NL80211_FLAG_NEED_WIPHY |
                                   NL80211_FLAG_NEED_RTNL,
         },
+        {
+                .cmd = NL80211_CMD_SET_QOS_MAP,
+                .doit = nl80211_set_qos_map,
+                .policy = nl80211_policy,
+                .flags = GENL_ADMIN_PERM,
+                .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+                                  NL80211_FLAG_NEED_RTNL,
+        },
 };
 
 /* notification functions */
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index a6c03ab14a0d..c8e225947adb 100644
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -932,4 +932,19 @@ static inline int rdev_channel_switch(struct cfg80211_registered_device *rdev,
         return ret;
 }
 
+static inline int rdev_set_qos_map(struct cfg80211_registered_device *rdev,
+                                   struct net_device *dev,
+                                   struct cfg80211_qos_map *qos_map)
+{
+        int ret = -EOPNOTSUPP;
+
+        if (rdev->ops->set_qos_map) {
+                trace_rdev_set_qos_map(&rdev->wiphy, dev, qos_map);
+                ret = rdev->ops->set_qos_map(&rdev->wiphy, dev, qos_map);
+                trace_rdev_return_int(&rdev->wiphy, ret);
+        }
+
+        return ret;
+}
+
 #endif /* __CFG80211_RDEV_OPS */
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index d3c5bd7c6b51..5d6e7bb2fc89 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -872,6 +872,8 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
                 for (i = 0; i < 6; i++)
                         rdev_del_key(rdev, dev, i, false, NULL);
 
+        rdev_set_qos_map(rdev, dev, NULL);
+
 #ifdef CONFIG_CFG80211_WEXT
         memset(&wrqu, 0, sizeof(wrqu));
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index f7aa7a72d9bc..fbcc23edee54 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -186,6 +186,28 @@
 
 #define BOOL_TO_STR(bo) (bo) ? "true" : "false"
 
+#define QOS_MAP_ENTRY __field(u8, num_des)                      \
+                      __array(u8, dscp_exception,               \
+                              2 * IEEE80211_QOS_MAP_MAX_EX)     \
+                      __array(u8, up, IEEE80211_QOS_MAP_LEN_MIN)
+#define QOS_MAP_ASSIGN(qos_map)                                 \
+        do {                                                    \
+                if ((qos_map)) {                                \
+                        __entry->num_des = (qos_map)->num_des;  \
+                        memcpy(__entry->dscp_exception,         \
+                               &(qos_map)->dscp_exception,      \
+                               2 * IEEE80211_QOS_MAP_MAX_EX);   \
+                        memcpy(__entry->up, &(qos_map)->up,     \
+                               IEEE80211_QOS_MAP_LEN_MIN);      \
+                } else {                                        \
+                        __entry->num_des = 0;                   \
+                        memset(__entry->dscp_exception, 0,      \
+                               2 * IEEE80211_QOS_MAP_MAX_EX);   \
+                        memset(__entry->up, 0,                  \
+                               IEEE80211_QOS_MAP_LEN_MIN);      \
+                }                                               \
+        } while (0)
+
 /*************************************************************
  *                      rdev->ops traces                     *
  *************************************************************/
@@ -1875,6 +1897,24 @@ TRACE_EVENT(rdev_channel_switch,
                   __entry->counter_offset_presp)
 );
 
+TRACE_EVENT(rdev_set_qos_map,
+        TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
+                 struct cfg80211_qos_map *qos_map),
+        TP_ARGS(wiphy, netdev, qos_map),
+        TP_STRUCT__entry(
+                WIPHY_ENTRY
+                NETDEV_ENTRY
+                QOS_MAP_ENTRY
+        ),
+        TP_fast_assign(
+                WIPHY_ASSIGN;
+                NETDEV_ASSIGN;
+                QOS_MAP_ASSIGN(qos_map);
+        ),
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", num_des: %u",
+                  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->num_des)
+);
+
 /*************************************************************
  *           cfg80211 exported functions traces              *
  *************************************************************/
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 935dea9485da..5618888853b2 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -689,7 +689,8 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
 EXPORT_SYMBOL(ieee80211_amsdu_to_8023s);
 
 /* Given a data frame determine the 802.1p/1d tag to use. */
-unsigned int cfg80211_classify8021d(struct sk_buff *skb)
+unsigned int cfg80211_classify8021d(struct sk_buff *skb,
+                                    struct cfg80211_qos_map *qos_map)
 {
         unsigned int dscp;
         unsigned char vlan_priority;
@@ -720,6 +721,21 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb)
                 return 0;
         }
 
+        if (qos_map) {
+                unsigned int i, tmp_dscp = dscp >> 2;
+
+                for (i = 0; i < qos_map->num_des; i++) {
+                        if (tmp_dscp == qos_map->dscp_exception[i].dscp)
+                                return qos_map->dscp_exception[i].up;
+                }
+
+                for (i = 0; i < 8; i++) {
+                        if (tmp_dscp >= qos_map->up[i].low &&
+                            tmp_dscp <= qos_map->up[i].high)
+                                return i;
+                }
+        }
+
         return dscp >> 5;
 }
 EXPORT_SYMBOL(cfg80211_classify8021d);
@@ -863,6 +879,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 
                 dev->ieee80211_ptr->use_4addr = false;
                 dev->ieee80211_ptr->mesh_id_up_len = 0;
+                rdev_set_qos_map(rdev, dev, NULL);
 
                 switch (otype) {
                 case NL80211_IFTYPE_AP: