Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking changes from David S. Miller:

 1) Fix IPSEC header length calculation for transport mode in ESP.  The
    issue is whether to do the calculation before or after alignment.
    Fix from Benjamin Poirier.

 2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
    Feng.  This is another transport vs tunnel mode issue.

 3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes.  Fix
    from James Chapman.

 4) Fix USB ASIX driver's reception of full sized VLAN packets, from
    Eric Dumazet.

 5) Allow drop monitor (and, more generically, all generic netlink
    protocols) to be automatically loaded as a module.  From Neil
    Horman.

Fix up trivial conflict in Documentation/feature-removal-schedule.txt
due to new entries added next to each other at the end. As usual.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
  net/smsc911x: Repair broken failure paths
  virtio-net: remove useless disable on freeze
  netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
  drop_monitor: Add module alias to enable automatic module loading
  genetlink: Build a generic netlink family module alias
  net: add MODULE_ALIAS_NET_PF_PROTO_NAME
  r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
  r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
  skb: avoid unnecessary reallocations in __skb_cow
  net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
  asix: allow full size 8021Q frames to be received
  rds_rdma: don't assume infiniband device is PCI
  l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
  mac80211: fix ADDBA declined after suspend with wowlan
  wlcore: fix undefined symbols when CONFIG_PM is not defined
  mac80211: fix flag check for QoS NOACK frames
  ath9k_hw: apply internal regulator settings on AR933x
  ath9k_hw: update AR933x initvals to fix issues with high power devices
  ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
  ath9k: stop rx dma before stopping tx
  ...

55 files changed, 343 insertions, 645 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index ebaffe208ccb..56000b33340b 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -606,3 +606,9 @@ Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support
 Who:    Ludovic Desroches <ludovic.desroches@atmel.com>
 
 ----------------------------
+
+What:   net/wanrouter/
+When:   June 2013
+Why:    Unsupported/unmaintained/unused since 2.6
+
+----------------------------
diff --git a/MAINTAINERS b/MAINTAINERS
index 64e675d6d478..8cad55b9db99 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6657,7 +6657,7 @@ F:	include/linux/taskstats*
 F:      kernel/taskstats.c
 
 TC CLASSIFIER
-M:      Jamal Hadi Salim <hadi@cyberus.ca>
+M:      Jamal Hadi Salim <jhs@mojatatu.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      include/linux/pkt_cls.h
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index e8cd652d2017..98510931c815 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card)
                         } else if (skb && card->using_dma) {
                                 SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
                                                                        skb->len, PCI_DMA_TODEVICE);
+                                card->tx_skb[port] = skb;
                                 iowrite32(SKB_CB(skb)->dma_addr,
                                           card->config_regs + TX_DMA_ADDR(port));
                         }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 db_fpga_upgrade = db_firmware_upgrade = 0;
         }
 
-        if (card->fpga_version >= DMA_SUPPORTED){
+        if (card->fpga_version >= DMA_SUPPORTED) {
+                pci_set_master(dev);
                 card->using_dma = 1;
         } else {
                 card->using_dma = 0;
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 4de73643fec6..d1827e887f4e 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1096,20 +1096,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         if (err) {
                 dev_err(&pdev->dev, "32-bit PCI DMA addresses"
                                 "not supported by the card\n");
-                goto err_out;
+                goto err_out_disable_dev;
         }
         err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 dev_err(&pdev->dev, "32-bit PCI DMA addresses"
                                 "not supported by the card\n");
-                goto err_out;
+                goto err_out_disable_dev;
         }
 
         /* IO Size check */
         if (pci_resource_len(pdev, bar) < io_size) {
                 dev_err(&pdev->dev, "Insufficient PCI resources, aborting\n");
                 err = -EIO;
-                goto err_out;
+                goto err_out_disable_dev;
         }
 
         pci_set_master(pdev);
@@ -1117,7 +1117,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         dev = alloc_etherdev(sizeof(struct r6040_private));
         if (!dev) {
                 err = -ENOMEM;
-                goto err_out;
+                goto err_out_disable_dev;
         }
         SET_NETDEV_DEV(dev, &pdev->dev);
         lp = netdev_priv(dev);
@@ -1233,11 +1233,15 @@ err_out_mdio_irq:
 err_out_mdio:
         mdiobus_free(lp->mii_bus);
 err_out_unmap:
+        netif_napi_del(&lp->napi);
+        pci_set_drvdata(pdev, NULL);
         pci_iounmap(pdev, ioaddr);
 err_out_free_res:
         pci_release_regions(pdev);
 err_out_free_dev:
         free_netdev(dev);
+err_out_disable_dev:
+        pci_disable_device(pdev);
 err_out:
         return err;
 }
@@ -1251,6 +1255,9 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
         mdiobus_unregister(lp->mii_bus);
         kfree(lp->mii_bus->irq);
         mdiobus_free(lp->mii_bus);
+        netif_napi_del(&lp->napi);
+        pci_set_drvdata(pdev, NULL);
+        pci_iounmap(pdev, lp->base);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index be3c22179161..667169b82526 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1101,8 +1101,12 @@ static int sh_eth_rx(struct net_device *ndev)
 
         /* Restart Rx engine if stopped. */
         /* If we don't need to check status, don't. -KDU */
-        if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R))
+        if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {
+                /* fix the values for the next receiving */
+                mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) -
+                                               sh_eth_read(ndev, RDLAR)) >> 4;
                 sh_eth_write(ndev, EDRRR_R, EDRRR);
+        }
 
         return 0;
 }
@@ -1199,8 +1203,6 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 /* Receive Descriptor Empty int */
                 ndev->stats.rx_over_errors++;
 
-                if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R)
-                        sh_eth_write(ndev, EDRRR_R, EDRRR);
                 if (netif_msg_rx_err(mdp))
                         dev_err(&ndev->dev, "Receive Descriptor Empty\n");
         }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index dab9c6f671ec..1466e5d2af44 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2390,11 +2390,11 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
 
         retval = smsc911x_request_resources(pdev);
         if (retval)
-                goto out_return_resources;
+                goto out_request_resources_fail;
 
         retval = smsc911x_enable_resources(pdev);
         if (retval)
-                goto out_disable_resources;
+                goto out_enable_resources_fail;
 
         if (pdata->ioaddr == NULL) {
                 SMSC_WARN(pdata, probe, "Error smsc911x base address invalid");
@@ -2501,8 +2501,9 @@ out_free_irq:
         free_irq(dev->irq, dev);
 out_disable_resources:
         (void)smsc911x_disable_resources(pdev);
-out_return_resources:
+out_enable_resources_fail:
         smsc911x_free_resources(pdev);
+out_request_resources_fail:
         platform_set_drvdata(pdev, NULL);
         iounmap(pdata->ioaddr);
         free_netdev(dev);
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 71e2b0523bc2..3ae80eccd0ef 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -35,6 +35,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/if_vlan.h>
 
 #define DRIVER_VERSION "22-Dec-2011"
 #define DRIVER_NAME "asix"
@@ -321,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         return 0;
                 }
 
-                if ((size > dev->net->mtu + ETH_HLEN) ||
+                if ((size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) ||
                     (size + offset > skb->len)) {
                         netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
                                    size);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 380dbea6109d..3b206786b5e7 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -547,6 +547,8 @@ static const struct usb_device_id products[] = {
         {QMI_GOBI_DEVICE(0x16d8, 0x8002)},      /* CMDTech Gobi 2000 Modem device (VU922) */
         {QMI_GOBI_DEVICE(0x05c6, 0x9205)},      /* Gobi 2000 Modem device */
         {QMI_GOBI_DEVICE(0x1199, 0x9013)},      /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
+        {QMI_GOBI_DEVICE(0x1199, 0x9015)},      /* Sierra Wireless Gobi 3000 Modem device */
+        {QMI_GOBI_DEVICE(0x1199, 0x9019)},      /* Sierra Wireless Gobi 3000 Modem device */
         { }                                     /* END */
 };
 MODULE_DEVICE_TABLE(usb, products);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9ce6995e8d08..5214b1eceb95 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1231,11 +1231,6 @@ static int virtnet_freeze(struct virtio_device *vdev)
         vi->config_enable = false;
         mutex_unlock(&vi->config_lock);
 
-        virtqueue_disable_cb(vi->rvq);
-        virtqueue_disable_cb(vi->svq);
-        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
-                virtqueue_disable_cb(vi->cvq);
-
         netif_device_detach(vi->dev);
         cancel_delayed_work_sync(&vi->refill);
 
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 0ba81a66061f..fbaa30930076 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2415,6 +2415,22 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
 * Initialization routines *
 \*************************/
 
+static const struct ieee80211_iface_limit if_limits[] = {
+        { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) },
+        { .max = 4,     .types =
+#ifdef CONFIG_MAC80211_MESH
+                                 BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                                 BIT(NL80211_IFTYPE_AP) },
+};
+
+static const struct ieee80211_iface_combination if_comb = {
+        .limits = if_limits,
+        .n_limits = ARRAY_SIZE(if_limits),
+        .max_interfaces = 2048,
+        .num_different_channels = 1,
+};
+
 int __devinit
 ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
 {
@@ -2436,6 +2452,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
+        hw->wiphy->iface_combinations = &if_comb;
+        hw->wiphy->n_iface_combinations = 1;
+
         /* SW support for IBSS_RSN is provided by mac80211 */
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index ac53d901801d..dfb0441f406c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3809,7 +3809,7 @@ static bool is_pmu_set(struct ath_hw *ah, u32 pmu_reg, int pmu_set)
         return true;
 }
 
-static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
+void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 {
         int internal_regulator =
                 ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 2505ac44f0c1..8396d150ce01 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -334,4 +334,7 @@ u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz);
 
 unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
                                            struct ath9k_channel *chan);
+
+void ar9003_hw_internal_regulator_apply(struct ath_hw *ah);
+
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
index f11d9b2677fd..1bd3a3d22101 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * 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
@@ -18,7 +19,7 @@
 #define INITVALS_9330_1P1_H
 
 static const u32 ar9331_1p1_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
@@ -27,10 +28,10 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
         {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
         {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009e04, 0x00202020, 0x00202020, 0x00202020, 0x00202020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
         {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e14, 0x31365d5e, 0x3136605e, 0x3136605e, 0x31365d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
@@ -55,7 +56,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
         {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},
+        {0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},
         {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
@@ -63,7 +64,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
 };
 
 static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -155,7 +156,7 @@ static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_modes_high_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52},
         {0x0000a2e0, 0xffb31c84, 0xffb31c84, 0xffb31c84, 0xffb31c84},
@@ -245,7 +246,7 @@ static const u32 ar9331_modes_high_ob_db_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -377,14 +378,14 @@ static const u32 ar9331_1p1_radio_core[][2] = {
         {0x000160b4, 0x92480040},
         {0x000160c0, 0x006db6db},
         {0x000160c4, 0x0186db60},
-        {0x000160c8, 0x6db6db6c},
+        {0x000160c8, 0x6db4db6c},
         {0x000160cc, 0x6de6c300},
         {0x000160d0, 0x14500820},
         {0x00016100, 0x04cb0001},
         {0x00016104, 0xfff80015},
         {0x00016108, 0x00080010},
         {0x0001610c, 0x00170000},
-        {0x00016140, 0x10804000},
+        {0x00016140, 0x10800000},
         {0x00016144, 0x01884080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x01000015},
@@ -417,7 +418,7 @@ static const u32 ar9331_1p1_radio_core[][2] = {
 };
 
 static const u32 ar9331_1p1_soc_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
 };
 
@@ -691,7 +692,7 @@ static const u32 ar9331_1p1_baseband_core[][2] = {
 };
 
 static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -783,7 +784,7 @@ static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_1p1_mac_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
         {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
         {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
@@ -973,26 +974,27 @@ static const u32 ar9331_1p1_mac_core[][2] = {
 
 static const u32 ar9331_common_rx_gain_1p1[][2] = {
         /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x01910190},
-        {0x0000a030, 0x01930192},
-        {0x0000a034, 0x01950194},
-        {0x0000a038, 0x038a0196},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
+        {0x00009e18, 0x05000000},
+        {0x0000a000, 0x00060005},
+        {0x0000a004, 0x00810080},
+        {0x0000a008, 0x00830082},
+        {0x0000a00c, 0x00850084},
+        {0x0000a010, 0x01820181},
+        {0x0000a014, 0x01840183},
+        {0x0000a018, 0x01880185},
+        {0x0000a01c, 0x018a0189},
+        {0x0000a020, 0x02850284},
+        {0x0000a024, 0x02890288},
+        {0x0000a028, 0x028b028a},
+        {0x0000a02c, 0x03850384},
+        {0x0000a030, 0x03890388},
+        {0x0000a034, 0x038b038a},
+        {0x0000a038, 0x038d038c},
+        {0x0000a03c, 0x03910390},
+        {0x0000a040, 0x03930392},
+        {0x0000a044, 0x03950394},
+        {0x0000a048, 0x00000396},
+        {0x0000a04c, 0x00000000},
         {0x0000a050, 0x00000000},
         {0x0000a054, 0x00000000},
         {0x0000a058, 0x00000000},
@@ -1005,15 +1007,15 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a074, 0x00000000},
         {0x0000a078, 0x00000000},
         {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x22222229},
-        {0x0000a084, 0x1d1d1d1d},
-        {0x0000a088, 0x1d1d1d1d},
-        {0x0000a08c, 0x1d1d1d1d},
-        {0x0000a090, 0x171d1d1d},
-        {0x0000a094, 0x11111717},
-        {0x0000a098, 0x00030311},
-        {0x0000a09c, 0x00000000},
-        {0x0000a0a0, 0x00000000},
+        {0x0000a080, 0x28282828},
+        {0x0000a084, 0x28282828},
+        {0x0000a088, 0x28282828},
+        {0x0000a08c, 0x28282828},
+        {0x0000a090, 0x28282828},
+        {0x0000a094, 0x24242428},
+        {0x0000a098, 0x171e1e1e},
+        {0x0000a09c, 0x02020b0b},
+        {0x0000a0a0, 0x02020202},
         {0x0000a0a4, 0x00000000},
         {0x0000a0a8, 0x00000000},
         {0x0000a0ac, 0x00000000},
@@ -1021,27 +1023,27 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a0b4, 0x00000000},
         {0x0000a0b8, 0x00000000},
         {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
+        {0x0000a0c0, 0x22072208},
+        {0x0000a0c4, 0x22052206},
+        {0x0000a0c8, 0x22032204},
+        {0x0000a0cc, 0x22012202},
+        {0x0000a0d0, 0x221f2200},
+        {0x0000a0d4, 0x221d221e},
+        {0x0000a0d8, 0x33023303},
+        {0x0000a0dc, 0x33003301},
+        {0x0000a0e0, 0x331e331f},
+        {0x0000a0e4, 0x4402331d},
+        {0x0000a0e8, 0x44004401},
+        {0x0000a0ec, 0x441e441f},
+        {0x0000a0f0, 0x55025503},
+        {0x0000a0f4, 0x55005501},
+        {0x0000a0f8, 0x551e551f},
+        {0x0000a0fc, 0x6602551d},
+        {0x0000a100, 0x66006601},
+        {0x0000a104, 0x661e661f},
+        {0x0000a108, 0x7703661d},
+        {0x0000a10c, 0x77017702},
+        {0x0000a110, 0x00007700},
         {0x0000a114, 0x00000000},
         {0x0000a118, 0x00000000},
         {0x0000a11c, 0x00000000},
@@ -1054,26 +1056,26 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a138, 0x00000000},
         {0x0000a13c, 0x00000000},
         {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
+        {0x0000a144, 0x111f1100},
+        {0x0000a148, 0x111d111e},
+        {0x0000a14c, 0x111b111c},
+        {0x0000a150, 0x22032204},
+        {0x0000a154, 0x22012202},
+        {0x0000a158, 0x221f2200},
+        {0x0000a15c, 0x221d221e},
+        {0x0000a160, 0x33013302},
+        {0x0000a164, 0x331f3300},
+        {0x0000a168, 0x4402331e},
+        {0x0000a16c, 0x44004401},
+        {0x0000a170, 0x441e441f},
+        {0x0000a174, 0x55015502},
+        {0x0000a178, 0x551f5500},
+        {0x0000a17c, 0x6602551e},
+        {0x0000a180, 0x66006601},
+        {0x0000a184, 0x661e661f},
+        {0x0000a188, 0x7703661d},
+        {0x0000a18c, 0x77017702},
+        {0x0000a190, 0x00007700},
         {0x0000a194, 0x00000000},
         {0x0000a198, 0x00000000},
         {0x0000a19c, 0x00000000},
@@ -1100,14 +1102,14 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a1f0, 0x00000396},
         {0x0000a1f4, 0x00000396},
         {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
+        {0x0000a1fc, 0x00000296},
 };
 
 static const u32 ar9331_common_tx_gain_offset1_1[][1] = {
-        {0},
-        {3},
-        {0},
-        {0},
+        {0x00000000},
+        {0x00000003},
+        {0x00000000},
+        {0x00000000},
 };
 
 static const u32 ar9331_1p1_chansel_xtal_25M[] = {
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index abe05ec85d50..7db1890448f2 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1468,6 +1468,9 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
                 return false;
 
         ah->chip_fullsleep = false;
+
+        if (AR_SREV_9330(ah))
+                ar9003_hw_internal_regulator_apply(ah);
         ath9k_hw_init_pll(ah, chan);
         ath9k_hw_set_rfmode(ah, chan);
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index dfa78e8b6470..4de4473776ac 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -239,7 +239,7 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool ret;
+        bool ret = true;
 
         ieee80211_stop_queues(sc->hw);
 
@@ -250,11 +250,12 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
         ath9k_debug_samp_bb_mac(sc);
         ath9k_hw_disable_interrupts(ah);
 
-        ret = ath_drain_all_txq(sc, retry_tx);
-
         if (!ath_stoprecv(sc))
                 ret = false;
 
+        if (!ath_drain_all_txq(sc, retry_tx))
+                ret = false;
+
         if (!flush) {
                 if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                         ath_rx_tasklet(sc, 1, true);
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 23eaa1b26ebe..d59dd01d6cde 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -64,7 +64,8 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
 static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                            struct ath_txq *txq,
                                            struct ath_atx_tid *tid,
-                                           struct sk_buff *skb);
+                                           struct sk_buff *skb,
+                                           bool dequeue);
 
 enum {
         MCS_HT20,
@@ -811,7 +812,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                 fi = get_frame_info(skb);
                 bf = fi->bf;
                 if (!fi->bf)
-                        bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+                        bf = ath_tx_setup_buffer(sc, txq, tid, skb, true);
 
                 if (!bf)
                         continue;
@@ -1726,7 +1727,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
                 return;
         }
 
-        bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+        bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb, false);
         if (!bf)
                 return;
 
@@ -1753,7 +1754,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
 
         bf = fi->bf;
         if (!bf)
-                bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+                bf = ath_tx_setup_buffer(sc, txq, tid, skb, false);
 
         if (!bf)
                 return;
@@ -1814,7 +1815,8 @@ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)
 static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                            struct ath_txq *txq,
                                            struct ath_atx_tid *tid,
-                                           struct sk_buff *skb)
+                                           struct sk_buff *skb,
+                                           bool dequeue)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_frame_info *fi = get_frame_info(skb);
@@ -1863,6 +1865,8 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
         return bf;
 
 error:
+        if (dequeue)
+                __skb_unlink(skb, &tid->buf_q);
         dev_kfree_skb_any(skb);
         return NULL;
 }
@@ -1893,7 +1897,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
                  */
                 ath_tx_send_ampdu(sc, tid, skb, txctl);
         } else {
-                bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+                bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb, false);
                 if (!bf)
                         return;
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index c5a34ffe6459..a299d42da8e7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -28,6 +28,7 @@
 #include <linux/uaccess.h>
 #include <linux/firmware.h>
 #include <linux/usb.h>
+#include <linux/vmalloc.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -1239,7 +1240,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
                 return -EINVAL;
         }
 
-        devinfo->image = kmalloc(fw->size, GFP_ATOMIC); /* plus nvram */
+        devinfo->image = vmalloc(fw->size); /* plus nvram */
         if (!devinfo->image)
                 return -ENOMEM;
 
@@ -1603,7 +1604,7 @@ static struct usb_driver brcmf_usbdrvr = {
 void brcmf_usb_exit(void)
 {
         usb_deregister(&brcmf_usbdrvr);
-        kfree(g_image.data);
+        vfree(g_image.data);
         g_image.data = NULL;
         g_image.len = 0;
 }
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index db6c6e528022..2463c0626438 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -137,11 +137,3 @@ config IWLWIFI_EXPERIMENTAL_MFP
           even if the microcode doesn't advertise it.
 
           Say Y only if you want to experiment with MFP.
-
-config IWLWIFI_UCODE16
-        bool "support uCode 16.0"
-        depends on IWLWIFI
-        help
-          This option enables support for uCode version 16.0.
-
-          Say Y if you want to use 16.0 microcode.
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 406f297a9a56..d615eacbf050 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -18,7 +18,6 @@ iwlwifi-objs		+= iwl-notif-wait.o
 iwlwifi-objs            += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
 
 
-iwlwifi-$(CONFIG_IWLWIFI_UCODE16) += iwl-phy-db.o
 iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 7f793417c787..8133105ac645 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -79,7 +79,7 @@ static const struct iwl_base_params iwl2000_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
         .hd_v2 = true,
 };
 
@@ -97,7 +97,7 @@ static const struct iwl_base_params iwl2030_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_LONG_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
         .hd_v2 = true,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 381b02cf339c..19f7ee84ae89 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -86,7 +86,7 @@ static const struct iwl_base_params iwl6000_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_base_params iwl6050_base_params = {
@@ -102,7 +102,7 @@ static const struct iwl_base_params iwl6050_base_params = {
         .chain_noise_scale = 1500,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 1024,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_base_params iwl6000_g2_base_params = {
@@ -118,7 +118,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_LONG_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_ht_params iwl6000_ht_params = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 51e1a69ffdda..8cebd7c363fc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -884,6 +884,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||
             (priv->bt_full_concurrent != full_concurrent)) {
                 priv->bt_full_concurrent = full_concurrent;
+                priv->last_bt_traffic_load = priv->bt_traffic_load;
 
                 /* Update uCode's rate table. */
                 tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index b31584e87bc7..aea07aab3c9e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -772,7 +772,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                                                 ~IWL_STA_DRIVER_ACTIVE;
                                 priv->stations[i].used &=
                                                 ~IWL_STA_UCODE_INPROGRESS;
-                                spin_unlock_bh(&priv->sta_lock);
+                                continue;
                         }
                         /*
                          * Rate scaling has already been initialized, send
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 3c72bad0ae56..d742900969ea 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -657,17 +657,17 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
         return -EINVAL;
 }
 
-static int alloc_pci_desc(struct iwl_drv *drv,
-                          struct iwl_firmware_pieces *pieces,
-                          enum iwl_ucode_type type)
+static int iwl_alloc_ucode(struct iwl_drv *drv,
+                           struct iwl_firmware_pieces *pieces,
+                           enum iwl_ucode_type type)
 {
         int i;
         for (i = 0;
              i < IWL_UCODE_SECTION_MAX && get_sec_size(pieces, type, i);
              i++)
                 if (iwl_alloc_fw_desc(drv, &(drv->fw.img[type].sec[i]),
-                                                get_sec(pieces, type, i)))
-                        return -1;
+                                      get_sec(pieces, type, i)))
+                        return -ENOMEM;
         return 0;
 }
 
@@ -825,8 +825,8 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
          * 1) unmodified from disk
          * 2) backup cache for save/restore during power-downs */
         for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
-                if (alloc_pci_desc(drv, &pieces, i))
-                        goto err_pci_alloc;
+                if (iwl_alloc_ucode(drv, &pieces, i))
+                        goto out_free_fw;
 
         /* Now that we can no longer fail, copy information */
 
@@ -866,7 +866,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
 
         if (!drv->op_mode)
-                goto out_unbind;
+                goto out_free_fw;
 
         return;
 
@@ -877,7 +877,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                 goto out_unbind;
         return;
 
- err_pci_alloc:
+ out_free_fw:
         IWL_ERR(drv, "failed to allocate pci memory\n");
         iwl_dealloc_ucode(drv);
         release_firmware(ucode_raw);
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
deleted file mode 100644
index f166955340fe..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#include <linux/slab.h>
-#include <linux/string.h>
-
-#include "iwl-debug.h"
-#include "iwl-dev.h"
-
-#include "iwl-phy-db.h"
-
-#define CHANNEL_NUM_SIZE        4       /* num of channels in calib_ch size */
-
-struct iwl_phy_db *iwl_phy_db_init(struct device *dev)
-{
-        struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
-                                            GFP_KERNEL);
-
-        if (!phy_db)
-                return phy_db;
-
-        phy_db->dev = dev;
-
-        /* TODO: add default values of the phy db. */
-        return phy_db;
-}
-
-/*
- * get phy db section: returns a pointer to a phy db section specified by
- * type and channel group id.
- */
-static struct iwl_phy_db_entry *
-iwl_phy_db_get_section(struct iwl_phy_db *phy_db,
-                       enum iwl_phy_db_section_type type,
-                       u16 chg_id)
-{
-        if (!phy_db || type < 0 || type >= IWL_PHY_DB_MAX)
-                return NULL;
-
-        switch (type) {
-        case IWL_PHY_DB_CFG:
-                return &phy_db->cfg;
-        case IWL_PHY_DB_CALIB_NCH:
-                return &phy_db->calib_nch;
-        case IWL_PHY_DB_CALIB_CH:
-                return &phy_db->calib_ch;
-        case IWL_PHY_DB_CALIB_CHG_PAPD:
-                if (chg_id < 0 || chg_id >= IWL_NUM_PAPD_CH_GROUPS)
-                        return NULL;
-                return &phy_db->calib_ch_group_papd[chg_id];
-        case IWL_PHY_DB_CALIB_CHG_TXP:
-                if (chg_id < 0 || chg_id >= IWL_NUM_TXP_CH_GROUPS)
-                        return NULL;
-                return &phy_db->calib_ch_group_txp[chg_id];
-        default:
-                return NULL;
-        }
-        return NULL;
-}
-
-static void iwl_phy_db_free_section(struct iwl_phy_db *phy_db,
-                                    enum iwl_phy_db_section_type type,
-                                    u16 chg_id)
-{
-        struct iwl_phy_db_entry *entry =
-                                iwl_phy_db_get_section(phy_db, type, chg_id);
-        if (!entry)
-                return;
-
-        kfree(entry->data);
-        entry->data = NULL;
-        entry->size = 0;
-}
-
-void iwl_phy_db_free(struct iwl_phy_db *phy_db)
-{
-        int i;
-
-        if (!phy_db)
-                return;
-
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CFG, 0);
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_NCH, 0);
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CH, 0);
-        for (i = 0; i < IWL_NUM_PAPD_CH_GROUPS; i++)
-                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_PAPD, i);
-        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++)
-                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_TXP, i);
-
-        kfree(phy_db);
-}
-
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
-                           enum iwl_phy_db_section_type type, u8 *data,
-                           u16 size, gfp_t alloc_ctx)
-{
-        struct iwl_phy_db_entry *entry;
-        u16 chg_id = 0;
-
-        if (!phy_db)
-                return -EINVAL;
-
-        if (type == IWL_PHY_DB_CALIB_CHG_PAPD ||
-            type == IWL_PHY_DB_CALIB_CHG_TXP)
-                chg_id = le16_to_cpup((__le16 *)data);
-
-        entry = iwl_phy_db_get_section(phy_db, type, chg_id);
-        if (!entry)
-                return -EINVAL;
-
-        kfree(entry->data);
-        entry->data = kmemdup(data, size, alloc_ctx);
-        if (!entry->data) {
-                entry->size = 0;
-                return -ENOMEM;
-        }
-
-        entry->size = size;
-
-        if (type == IWL_PHY_DB_CALIB_CH) {
-                phy_db->channel_num = le32_to_cpup((__le32 *)data);
-                phy_db->channel_size =
-                      (size - CHANNEL_NUM_SIZE) / phy_db->channel_num;
-        }
-
-        return 0;
-}
-
-static int is_valid_channel(u16 ch_id)
-{
-        if (ch_id <= 14 ||
-            (36 <= ch_id && ch_id <= 64 && ch_id % 4 == 0) ||
-            (100 <= ch_id && ch_id <= 140 && ch_id % 4 == 0) ||
-            (145 <= ch_id && ch_id <= 165 && ch_id % 4 == 1))
-                return 1;
-        return 0;
-}
-
-static u8 ch_id_to_ch_index(u16 ch_id)
-{
-        if (WARN_ON(!is_valid_channel(ch_id)))
-                return 0xff;
-
-        if (ch_id <= 14)
-                return ch_id - 1;
-        if (ch_id <= 64)
-                return (ch_id + 20) / 4;
-        if (ch_id <= 140)
-                return (ch_id - 12) / 4;
-        return (ch_id - 13) / 4;
-}
-
-
-static u16 channel_id_to_papd(u16 ch_id)
-{
-        if (WARN_ON(!is_valid_channel(ch_id)))
-                return 0xff;
-
-        if (1 <= ch_id && ch_id <= 14)
-                return 0;
-        if (36 <= ch_id && ch_id <= 64)
-                return 1;
-        if (100 <= ch_id && ch_id <= 140)
-                return 2;
-        return 3;
-}
-
-static u16 channel_id_to_txp(struct iwl_phy_db *phy_db, u16 ch_id)
-{
-        struct iwl_phy_db_chg_txp *txp_chg;
-        int i;
-        u8 ch_index = ch_id_to_ch_index(ch_id);
-        if (ch_index == 0xff)
-                return 0xff;
-
-        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++) {
-                txp_chg = (void *)phy_db->calib_ch_group_txp[i].data;
-                if (!txp_chg)
-                        return 0xff;
-                /*
-                 * Looking for the first channel group that its max channel is
-                 * higher then wanted channel.
-                 */
-                if (le16_to_cpu(txp_chg->max_channel_idx) >= ch_index)
-                        return i;
-        }
-        return 0xff;
-}
-
-int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
-                                enum iwl_phy_db_section_type type, u8 **data,
-                                u16 *size, u16 ch_id)
-{
-        struct iwl_phy_db_entry *entry;
-        u32 channel_num;
-        u32 channel_size;
-        u16 ch_group_id = 0;
-        u16 index;
-
-        if (!phy_db)
-                return -EINVAL;
-
-        /* find wanted channel group */
-        if (type == IWL_PHY_DB_CALIB_CHG_PAPD)
-                ch_group_id = channel_id_to_papd(ch_id);
-        else if (type == IWL_PHY_DB_CALIB_CHG_TXP)
-                ch_group_id = channel_id_to_txp(phy_db, ch_id);
-
-        entry = iwl_phy_db_get_section(phy_db, type, ch_group_id);
-        if (!entry)
-                return -EINVAL;
-
-        if (type == IWL_PHY_DB_CALIB_CH) {
-                index = ch_id_to_ch_index(ch_id);
-                channel_num = phy_db->channel_num;
-                channel_size = phy_db->channel_size;
-                if (index >= channel_num) {
-                        IWL_ERR(phy_db, "Wrong channel number %d", ch_id);
-                        return -EINVAL;
-                }
-                *data = entry->data + CHANNEL_NUM_SIZE + index * channel_size;
-                *size = channel_size;
-        } else {
-                *data = entry->data;
-                *size = entry->size;
-        }
-        return 0;
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
deleted file mode 100644
index c34c6a9303ab..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#ifndef __IWL_PHYDB_H__
-#define __IWL_PHYDB_H__
-
-#include <linux/types.h>
-
-#define IWL_NUM_PAPD_CH_GROUPS  4
-#define IWL_NUM_TXP_CH_GROUPS   8
-
-struct iwl_phy_db_entry {
-        u16     size;
-        u8      *data;
-};
-
-struct iwl_shared;
-
-/**
- * struct iwl_phy_db - stores phy configuration and calibration data.
- *
- * @cfg: phy configuration.
- * @calib_nch: non channel specific calibration data.
- * @calib_ch: channel specific calibration data.
- * @calib_ch_group_papd: calibration data related to papd channel group.
- * @calib_ch_group_txp: calibration data related to tx power chanel group.
- */
-struct iwl_phy_db {
-        struct iwl_phy_db_entry cfg;
-        struct iwl_phy_db_entry calib_nch;
-        struct iwl_phy_db_entry calib_ch;
-        struct iwl_phy_db_entry calib_ch_group_papd[IWL_NUM_PAPD_CH_GROUPS];
-        struct iwl_phy_db_entry calib_ch_group_txp[IWL_NUM_TXP_CH_GROUPS];
-
-        u32 channel_num;
-        u32 channel_size;
-
-        /* for an access to the logger */
-        struct device *dev;
-};
-
-enum iwl_phy_db_section_type {
-        IWL_PHY_DB_CFG = 1,
-        IWL_PHY_DB_CALIB_NCH,
-        IWL_PHY_DB_CALIB_CH,
-        IWL_PHY_DB_CALIB_CHG_PAPD,
-        IWL_PHY_DB_CALIB_CHG_TXP,
-        IWL_PHY_DB_MAX
-};
-
-/* for parsing of tx power channel group data that comes from the firmware*/
-struct iwl_phy_db_chg_txp {
-        __le32 space;
-        __le16 max_channel_idx;
-} __packed;
-
-struct iwl_phy_db *iwl_phy_db_init(struct device *dev);
-
-void iwl_phy_db_free(struct iwl_phy_db *phy_db);
-
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
-                           enum iwl_phy_db_section_type type, u8 *data,
-                           u16 size, gfp_t alloc_ctx);
-
-int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
-                                enum iwl_phy_db_section_type type, u8 **data,
-                                u16 *size, u16 ch_id);
-
-#endif /* __IWL_PHYDB_H__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index 6213c05a4b52..e959207c630a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -347,7 +347,7 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
 void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,
                                  int sta_id, int tid, int frame_limit, u16 ssn);
 void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-        int index, enum dma_data_direction dma_dir);
+                         enum dma_data_direction dma_dir);
 int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                          struct sk_buff_head *skbs);
 int iwl_queue_space(const struct iwl_queue *q);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index 21a8a672fbb2..a8750238ee09 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -204,33 +204,39 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
         for (i = 1; i < num_tbs; i++)
                 dma_unmap_single(trans->dev, iwl_tfd_tb_get_addr(tfd, i),
                                 iwl_tfd_tb_get_len(tfd, i), dma_dir);
+
+        tfd->num_tbs = 0;
 }
 
 /**
  * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
  * @trans - transport private data
  * @txq - tx queue
- * @index - the index of the TFD to be freed
- *@dma_dir - the direction of the DMA mapping
+ * @dma_dir - the direction of the DMA mapping
  *
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
 void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-        int index, enum dma_data_direction dma_dir)
+                         enum dma_data_direction dma_dir)
 {
         struct iwl_tfd *tfd_tmp = txq->tfds;
 
+        /* rd_ptr is bounded by n_bd and idx is bounded by n_window */
+        int rd_ptr = txq->q.read_ptr;
+        int idx = get_cmd_index(&txq->q, rd_ptr);
+
         lockdep_assert_held(&txq->lock);
 
-        iwlagn_unmap_tfd(trans, &txq->entries[index].meta,
-                         &tfd_tmp[index], dma_dir);
+        /* We have only q->n_window txq->entries, but we use q->n_bd tfds */
+        iwlagn_unmap_tfd(trans, &txq->entries[idx].meta,
+                         &tfd_tmp[rd_ptr], dma_dir);
 
         /* free SKB */
         if (txq->entries) {
                 struct sk_buff *skb;
 
-                skb = txq->entries[index].skb;
+                skb = txq->entries[idx].skb;
 
                 /* Can be called from irqs-disabled context
                  * If skb is not NULL, it means that the whole queue is being
@@ -238,7 +244,7 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
                  */
                 if (skb) {
                         iwl_op_mode_free_skb(trans->op_mode, skb);
-                        txq->entries[index].skb = NULL;
+                        txq->entries[idx].skb = NULL;
                 }
         }
 }
@@ -973,7 +979,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
                 iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
-                iwlagn_txq_free_tfd(trans, txq, txq->q.read_ptr, DMA_TO_DEVICE);
+                iwlagn_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
                 freed++;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 2e57161854b9..ec6fb395b84d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -435,9 +435,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
 
         spin_lock_bh(&txq->lock);
         while (q->write_ptr != q->read_ptr) {
-                /* The read_ptr needs to bound by q->n_window */
-                iwlagn_txq_free_tfd(trans, txq, get_cmd_index(q, q->read_ptr),
-                                    dma_dir);
+                iwlagn_txq_free_tfd(trans, txq, dma_dir);
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
         }
         spin_unlock_bh(&txq->lock);
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 1b851f650e07..e2750a12c6f1 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -260,6 +260,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         }
 
         if (wl->irq) {
+                irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
                 ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);
                 if (ret < 0) {
                         wl1251_error("request_irq() failed: %d", ret);
@@ -267,7 +268,6 @@ static int wl1251_sdio_probe(struct sdio_func *func,
                 }
 
                 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
-                disable_irq(wl->irq);
 
                 wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
                 wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 6248c354fc5c..87f6305bda2c 100644
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -281,6 +281,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         wl->use_eeprom = pdata->use_eeprom;
 
+        irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
         ret = request_irq(wl->irq, wl1251_irq, 0, DRIVER_NAME, wl);
         if (ret < 0) {
                 wl1251_error("request_irq() failed: %d", ret);
@@ -289,8 +290,6 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
 
-        disable_irq(wl->irq);
-
         ret = wl1251_init_ieee80211(wl);
         if (ret)
                 goto out_irq;
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index 509aa881d790..f3d6fa508269 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -1715,6 +1715,7 @@ out:
 
 }
 
+#ifdef CONFIG_PM
 /* Set the global behaviour of RX filters - On/Off + default action */
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
                                         enum rx_filter_action action)
@@ -1794,3 +1795,4 @@ out:
         kfree(acx);
         return ret;
 }
+#endif /* CONFIG_PM */
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index 8106b2ebfe60..e6a74869a5ff 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -1330,9 +1330,11 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);
 int wl1271_acx_fm_coex(struct wl1271 *wl);
 int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);
 int wl12xx_acx_config_hangover(struct wl1271 *wl);
+
+#ifdef CONFIG_PM
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
                                         enum rx_filter_action action);
 int wl1271_acx_set_rx_filter(struct wl1271 *wl, u8 index, bool enable,
                              struct wl12xx_rx_filter *filter);
-
+#endif /* CONFIG_PM */
 #endif /* __WL1271_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index 1f1d9488dfb6..d6a3c6b07827 100644
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -279,6 +279,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
         wl12xx_rearm_rx_streaming(wl, active_hlids);
 }
 
+#ifdef CONFIG_PM
 int wl1271_rx_filter_enable(struct wl1271 *wl,
                             int index, bool enable,
                             struct wl12xx_rx_filter *filter)
@@ -314,3 +315,4 @@ void wl1271_rx_filter_clear_all(struct wl1271 *wl)
                 wl1271_rx_filter_enable(wl, i, 0, NULL);
         }
 }
+#endif /* CONFIG_PM */
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 2596401308a8..f4a6fcaeffb1 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -325,8 +325,7 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb)
         unsigned int count;
         int i, copy_off;
 
-        count = DIV_ROUND_UP(
-                        offset_in_page(skb->data)+skb_headlen(skb), PAGE_SIZE);
+        count = DIV_ROUND_UP(skb_headlen(skb), PAGE_SIZE);
 
         copy_off = skb_headlen(skb) % PAGE_SIZE;
 
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 46f4a9f9f5e4..281f18c2fb82 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -232,7 +232,7 @@ static int pn544_hci_i2c_write(struct i2c_client *client, u8 *buf, int len)
 
 static int check_crc(u8 *buf, int buflen)
 {
-        u8 len;
+        int len;
         u16 crc;
 
         len = buf[0] + 1;
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 73c28dea10ae..7a114016ac7d 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -110,6 +110,9 @@ extern int lockdep_genl_is_held(void);
 #define genl_dereference(p)                                     \
         rcu_dereference_protected(p, lockdep_genl_is_held())
 
+#define MODULE_ALIAS_GENL_FAMILY(family)\
+ MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
+
 #endif /* __KERNEL__ */
 
 #endif  /* __LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/net.h b/include/linux/net.h
index 2d7510f38934..e9ac2df079ba 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -313,5 +313,8 @@ extern int kernel_sock_shutdown(struct socket *sock,
         MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
                      "-type-" __stringify(type))
 
+#define MODULE_ALIAS_NET_PF_PROTO_NAME(pf, proto, name) \
+        MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
+                     name)
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_NET_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e7fd468f7126..d94cb1431519 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2795,15 +2795,15 @@ do {								\
 #define netif_info(priv, type, dev, fmt, args...)               \
         netif_level(info, priv, type, dev, fmt, ##args)
 
-#if defined(DEBUG)
-#define netif_dbg(priv, type, dev, format, args...)             \
-        netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
-#elif defined(CONFIG_DYNAMIC_DEBUG)
+#if defined(CONFIG_DYNAMIC_DEBUG)
 #define netif_dbg(priv, type, netdev, format, args...)          \
 do {                                                            \
         if (netif_msg_##type(priv))                             \
                 dynamic_netdev_dbg(netdev, format, ##args);     \
 } while (0)
+#elif defined(DEBUG)
+#define netif_dbg(priv, type, dev, format, args...)             \
+        netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
 #else
 #define netif_dbg(priv, type, dev, format, args...)                     \
 ({                                                                      \
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0e501714d47f..b534a1be540a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1896,8 +1896,6 @@ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
 {
         int delta = 0;
 
-        if (headroom < NET_SKB_PAD)
-                headroom = NET_SKB_PAD;
         if (headroom > skb_headroom(skb))
                 delta = headroom - skb_headroom(skb);
 
diff --git a/include/net/dst.h b/include/net/dst.h
index bed833d9796a..8197eadca819 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -60,6 +60,7 @@ struct dst_entry {
 #define DST_NOCOUNT             0x0020
 #define DST_NOPEER              0x0040
 #define DST_FAKE_RTABLE         0x0080
+#define DST_XFRM_TUNNEL         0x0100
 
         short                   error;
         short                   obsolete;
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 3252e7e0a005..ea5fb9fcc3f5 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -468,3 +468,4 @@ module_exit(exit_net_drop_monitor);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Neil Horman <nhorman@tuxdriver.com>");
+MODULE_ALIAS_GENL_FAMILY("NET_DM");
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 89a47b35905d..cb982a61536f 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -459,28 +459,22 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
         struct esp_data *esp = x->data;
         u32 blksize = ALIGN(crypto_aead_blocksize(esp->aead), 4);
         u32 align = max_t(u32, blksize, esp->padlen);
-        u32 rem;
-
-        mtu -= x->props.header_len + crypto_aead_authsize(esp->aead);
-        rem = mtu & (align - 1);
-        mtu &= ~(align - 1);
+        unsigned int net_adj;
 
         switch (x->props.mode) {
-        case XFRM_MODE_TUNNEL:
-                break;
-        default:
         case XFRM_MODE_TRANSPORT:
-                /* The worst case */
-                mtu -= blksize - 4;
-                mtu += min_t(u32, blksize - 4, rem);
-                break;
         case XFRM_MODE_BEET:
-                /* The worst case. */
-                mtu += min_t(u32, IPV4_BEET_PHMAXLEN, rem);
+                net_adj = sizeof(struct iphdr);
                 break;
+        case XFRM_MODE_TUNNEL:
+                net_adj = 0;
+                break;
+        default:
+                BUG();
         }
 
-        return mtu - 2;
+        return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
+                 net_adj) & ~(align - 1)) + (net_adj - 2);
 }
 
 static void esp4_err(struct sk_buff *skb, u32 info)
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 1e62b7557b00..db1521fcda5b 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -413,19 +413,15 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
         struct esp_data *esp = x->data;
         u32 blksize = ALIGN(crypto_aead_blocksize(esp->aead), 4);
         u32 align = max_t(u32, blksize, esp->padlen);
-        u32 rem;
+        unsigned int net_adj;
 
-        mtu -= x->props.header_len + crypto_aead_authsize(esp->aead);
-        rem = mtu & (align - 1);
-        mtu &= ~(align - 1);
-
-        if (x->props.mode != XFRM_MODE_TUNNEL) {
-                u32 padsize = ((blksize - 1) & 7) + 1;
-                mtu -= blksize - padsize;
-                mtu += min_t(u32, blksize - padsize, rem);
-        }
+        if (x->props.mode != XFRM_MODE_TUNNEL)
+                net_adj = sizeof(struct ipv6hdr);
+        else
+                net_adj = 0;
 
-        return mtu - 2;
+        return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
+                 net_adj) & ~(align - 1)) + (net_adj - 2);
 }
 
 static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d99fdc699625..17b8c67998bb 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1187,6 +1187,29 @@ static inline struct ipv6_rt_hdr *ip6_rthdr_dup(struct ipv6_rt_hdr *src,
         return src ? kmemdup(src, (src->hdrlen + 1) * 8, gfp) : NULL;
 }
 
+static void ip6_append_data_mtu(int *mtu,
+                                int *maxfraglen,
+                                unsigned int fragheaderlen,
+                                struct sk_buff *skb,
+                                struct rt6_info *rt)
+{
+        if (!(rt->dst.flags & DST_XFRM_TUNNEL)) {
+                if (skb == NULL) {
+                        /* first fragment, reserve header_len */
+                        *mtu = *mtu - rt->dst.header_len;
+
+                } else {
+                        /*
+                         * this fragment is not first, the headers
+                         * space is regarded as data space.
+                         */
+                        *mtu = dst_mtu(rt->dst.path);
+                }
+                *maxfraglen = ((*mtu - fragheaderlen) & ~7)
+                              + fragheaderlen - sizeof(struct frag_hdr);
+        }
+}
+
 int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
         int offset, int len, int odd, struct sk_buff *skb),
         void *from, int length, int transhdrlen,
@@ -1196,7 +1219,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
         struct inet_sock *inet = inet_sk(sk);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct inet_cork *cork;
-        struct sk_buff *skb;
+        struct sk_buff *skb, *skb_prev = NULL;
         unsigned int maxfraglen, fragheaderlen;
         int exthdrlen;
         int dst_exthdrlen;
@@ -1253,8 +1276,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
                 inet->cork.fl.u.ip6 = *fl6;
                 np->cork.hop_limit = hlimit;
                 np->cork.tclass = tclass;
-                mtu = np->pmtudisc == IPV6_PMTUDISC_PROBE ?
-                      rt->dst.dev->mtu : dst_mtu(&rt->dst);
+                if (rt->dst.flags & DST_XFRM_TUNNEL)
+                        mtu = np->pmtudisc == IPV6_PMTUDISC_PROBE ?
+                              rt->dst.dev->mtu : dst_mtu(&rt->dst);
+                else
+                        mtu = np->pmtudisc == IPV6_PMTUDISC_PROBE ?
+                              rt->dst.dev->mtu : dst_mtu(rt->dst.path);
                 if (np->frag_size < mtu) {
                         if (np->frag_size)
                                 mtu = np->frag_size;
@@ -1350,25 +1377,27 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
                         unsigned int fraglen;
                         unsigned int fraggap;
                         unsigned int alloclen;
-                        struct sk_buff *skb_prev;
 alloc_new_skb:
-                        skb_prev = skb;
-
                         /* There's no room in the current skb */
-                        if (skb_prev)
-                                fraggap = skb_prev->len - maxfraglen;
+                        if (skb)
+                                fraggap = skb->len - maxfraglen;
                         else
                                 fraggap = 0;
+                        /* update mtu and maxfraglen if necessary */
+                        if (skb == NULL || skb_prev == NULL)
+                                ip6_append_data_mtu(&mtu, &maxfraglen,
+                                                    fragheaderlen, skb, rt);
+
+                        skb_prev = skb;
 
                         /*
                          * If remaining data exceeds the mtu,
                          * we know we need more fragment(s).
                          */
                         datalen = length + fraggap;
-                        if (datalen > (cork->length <= mtu && !(cork->flags & IPCORK_ALLFRAG) ? mtu : maxfraglen) - fragheaderlen)
-                                datalen = maxfraglen - fragheaderlen;
 
-                        fraglen = datalen + fragheaderlen;
+                        if (datalen > (cork->length <= mtu && !(cork->flags & IPCORK_ALLFRAG) ? mtu : maxfraglen) - fragheaderlen)
+                                datalen = maxfraglen - fragheaderlen - rt->dst.trailer_len;
                         if ((flags & MSG_MORE) &&
                             !(rt->dst.dev->features&NETIF_F_SG))
                                 alloclen = mtu;
@@ -1377,13 +1406,16 @@ alloc_new_skb:
 
                         alloclen += dst_exthdrlen;
 
-                        /*
-                         * The last fragment gets additional space at tail.
-                         * Note: we overallocate on fragments with MSG_MODE
-                         * because we have no idea if we're the last one.
-                         */
-                        if (datalen == length + fraggap)
-                                alloclen += rt->dst.trailer_len;
+                        if (datalen != length + fraggap) {
+                                /*
+                                 * this is not the last fragment, the trailer
+                                 * space is regarded as data space.
+                                 */
+                                datalen += rt->dst.trailer_len;
+                        }
+
+                        alloclen += rt->dst.trailer_len;
+                        fraglen = datalen + fragheaderlen;
 
                         /*
                          * We just reserve space for fragment header.
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 889f5d13d7ba..70614e7affab 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -239,9 +239,16 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 {
         struct inet_sock *inet = inet_sk(sk);
         struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr;
-        int ret = -EINVAL;
+        int ret;
         int chk_addr_ret;
 
+        if (!sock_flag(sk, SOCK_ZAPPED))
+                return -EINVAL;
+        if (addr_len < sizeof(struct sockaddr_l2tpip))
+                return -EINVAL;
+        if (addr->l2tp_family != AF_INET)
+                return -EINVAL;
+
         ret = -EADDRINUSE;
         read_lock_bh(&l2tp_ip_lock);
         if (__l2tp_ip_bind_lookup(&init_net, addr->l2tp_addr.s_addr, sk->sk_bound_dev_if, addr->l2tp_conn_id))
@@ -272,6 +279,8 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         sk_del_node_init(sk);
         write_unlock_bh(&l2tp_ip_lock);
         ret = 0;
+        sock_reset_flag(sk, SOCK_ZAPPED);
+
 out:
         release_sock(sk);
 
@@ -288,6 +297,9 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
         struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr;
         int rc;
 
+        if (sock_flag(sk, SOCK_ZAPPED)) /* Must bind first - autobinding does not work */
+                return -EINVAL;
+
         if (addr_len < sizeof(*lsa))
                 return -EINVAL;
 
@@ -311,6 +323,14 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
         return rc;
 }
 
+static int l2tp_ip_disconnect(struct sock *sk, int flags)
+{
+        if (sock_flag(sk, SOCK_ZAPPED))
+                return 0;
+
+        return udp_disconnect(sk, flags);
+}
+
 static int l2tp_ip_getname(struct socket *sock, struct sockaddr *uaddr,
                            int *uaddr_len, int peer)
 {
@@ -530,7 +550,7 @@ static struct proto l2tp_ip_prot = {
         .close             = l2tp_ip_close,
         .bind              = l2tp_ip_bind,
         .connect           = l2tp_ip_connect,
-        .disconnect        = udp_disconnect,
+        .disconnect        = l2tp_ip_disconnect,
         .ioctl             = udp_ioctl,
         .destroy           = l2tp_ip_destroy_sock,
         .setsockopt        = ip_setsockopt,
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 0291d8d85f30..35e1e4bde587 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -258,6 +258,10 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         int addr_type;
         int err;
 
+        if (!sock_flag(sk, SOCK_ZAPPED))
+                return -EINVAL;
+        if (addr->l2tp_family != AF_INET6)
+                return -EINVAL;
         if (addr_len < sizeof(*addr))
                 return -EINVAL;
 
@@ -331,6 +335,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         sk_del_node_init(sk);
         write_unlock_bh(&l2tp_ip6_lock);
 
+        sock_reset_flag(sk, SOCK_ZAPPED);
         release_sock(sk);
         return 0;
 
@@ -354,6 +359,9 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
         int     addr_type;
         int rc;
 
+        if (sock_flag(sk, SOCK_ZAPPED)) /* Must bind first - autobinding does not work */
+                return -EINVAL;
+
         if (addr_len < sizeof(*lsa))
                 return -EINVAL;
 
@@ -383,6 +391,14 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
         return rc;
 }
 
+static int l2tp_ip6_disconnect(struct sock *sk, int flags)
+{
+        if (sock_flag(sk, SOCK_ZAPPED))
+                return 0;
+
+        return udp_disconnect(sk, flags);
+}
+
 static int l2tp_ip6_getname(struct socket *sock, struct sockaddr *uaddr,
                             int *uaddr_len, int peer)
 {
@@ -689,7 +705,7 @@ static struct proto l2tp_ip6_prot = {
         .close             = l2tp_ip6_close,
         .bind              = l2tp_ip6_bind,
         .connect           = l2tp_ip6_connect,
-        .disconnect        = udp_disconnect,
+        .disconnect        = l2tp_ip6_disconnect,
         .ioctl             = udp_ioctl,
         .destroy           = l2tp_ip6_destroy_sock,
         .setsockopt        = ipv6_setsockopt,
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 8577264378fe..ddc553e76671 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -923,5 +923,4 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("L2TP netlink");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("1.0");
-MODULE_ALIAS("net-pf-" __stringify(PF_NETLINK) "-proto-" \
-             __stringify(NETLINK_GENERIC) "-type-" "l2tp");
+MODULE_ALIAS_GENL_FAMILY("l2tp");
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b3b3c264ff66..04c306308987 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1522,6 +1522,8 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
          * anymore. The timeout will be reset if the frame is ACKed by
          * the AP.
          */
+        ifmgd->probe_send_count++;
+
         if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {
                 ifmgd->nullfunc_failed = false;
                 ieee80211_send_nullfunc(sdata->local, sdata, 0);
@@ -1538,7 +1540,6 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
                                          0, (u32) -1, true, false);
         }
 
-        ifmgd->probe_send_count++;
         ifmgd->probe_timeout = jiffies + msecs_to_jiffies(probe_wait_ms);
         run_again(ifmgd, ifmgd->probe_timeout);
         if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 5f827a6b0d8d..847215bb2a6f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
 
         /* Don't calculate ACKs for QoS Frames with NoAck Policy set */
         if (ieee80211_is_data_qos(hdr->frame_control) &&
-            *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
+            *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
                 dur = 0;
         else
                 /* Time needed to transmit ACK
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 22f2216b397e..a44c6807df01 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1371,6 +1371,12 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 }
         }
 
+        /* add back keys */
+        list_for_each_entry(sdata, &local->interfaces, list)
+                if (ieee80211_sdata_running(sdata))
+                        ieee80211_enable_keys(sdata);
+
+ wake_up:
         /*
          * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
          * sessions can be established after a resume.
@@ -1392,12 +1398,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 mutex_unlock(&local->sta_mtx);
         }
 
-        /* add back keys */
-        list_for_each_entry(sdata, &local->interfaces, list)
-                if (ieee80211_sdata_running(sdata))
-                        ieee80211_enable_keys(sdata);
-
- wake_up:
         ieee80211_wake_queues_by_reason(hw,
                         IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 8340ace837f2..2cc7c1ee7690 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -836,7 +836,7 @@ static int ctrl_getfamily(struct sk_buff *skb, struct genl_info *info)
 #ifdef CONFIG_MODULES
                 if (res == NULL) {
                         genl_unlock();
-                        request_module("net-pf-%d-proto-%d-type-%s",
+                        request_module("net-pf-%d-proto-%d-family-%s",
                                        PF_NETLINK, NETLINK_GENERIC, name);
                         genl_lock();
                         res = genl_family_find_byname(name);
diff --git a/net/rds/ib.h b/net/rds/ib.h
index edfaaaf164eb..8d2b3d5a7c21 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -186,8 +186,7 @@ struct rds_ib_device {
         struct work_struct      free_work;
 };
 
-#define pcidev_to_node(pcidev) pcibus_to_node(pcidev->bus)
-#define ibdev_to_node(ibdev) pcidev_to_node(to_pci_dev(ibdev->dma_device))
+#define ibdev_to_node(ibdev) dev_to_node(ibdev->dma_device)
 #define rdsibdev_to_node(rdsibdev) ibdev_to_node(rdsibdev->dev)
 
 /* bits for i_ack_flags */
diff --git a/net/wanrouter/Kconfig b/net/wanrouter/Kconfig
index 61ceae0b9566..a157a2e64e18 100644
--- a/net/wanrouter/Kconfig
+++ b/net/wanrouter/Kconfig
@@ -3,7 +3,7 @@
 #
 
 config WAN_ROUTER
-        tristate "WAN router"
+        tristate "WAN router (DEPRECATED)"
         depends on EXPERIMENTAL
         ---help---
           Wide Area Networks (WANs), such as X.25, frame relay and leased
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index c53e8f42aa75..ccfbd328a69d 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1921,6 +1921,9 @@ no_transform:
         }
 ok:
         xfrm_pols_put(pols, drop_pols);
+        if (dst && dst->xfrm &&
+            dst->xfrm->props.mode == XFRM_MODE_TUNNEL)
+                dst->flags |= DST_XFRM_TUNNEL;
         return dst;
 
 nopol: