106 files changed, 4945 insertions, 2435 deletions

diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 80c728522c4c..e4d3267071e4 100644
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -171,7 +171,7 @@ Where the supported parameter are:
   
   led
         Can be used to turn on experimental LED code.
-        0 = Off, 1 = On.  Default is 0.
+        0 = Off, 1 = On.  Default is 1.
 
   mode
         Can be used to set the default mode of the adapter.  
diff --git a/MAINTAINERS b/MAINTAINERS
index 0924a76da873..2ebb56710f4d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2978,20 +2978,14 @@ F:	drivers/net/ixgb/
 F:      drivers/net/ixgbe/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
-M:      Reinette Chatre <reinette.chatre@intel.com>
-M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://ipw2100.sourceforge.net
-S:      Odd Fixes
+S:      Orphan
 F:      Documentation/networking/README.ipw2100
 F:      drivers/net/wireless/ipw2x00/ipw2100.*
 
 INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
-M:      Reinette Chatre <reinette.chatre@intel.com>
-M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://ipw2200.sourceforge.net
-S:      Odd Fixes
+S:      Orphan
 F:      Documentation/networking/README.ipw2200
 F:      drivers/net/wireless/ipw2x00/ipw2200.*
 
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index cf16318a0a17..ea6362a8988d 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -566,7 +566,7 @@ enum ath5k_pkt_type {
 )
 
 /*
- * DMA size definitions (2^n+2)
+ * DMA size definitions (2^(n+2))
  */
 enum ath5k_dmasize {
         AR5K_DMASIZE_4B = 0,
@@ -1127,15 +1127,10 @@ struct ath5k_hw {
         /*
          * Function pointers
          */
-        int (*ah_setup_rx_desc)(struct ath5k_hw *ah, struct ath5k_desc *desc,
-                                u32 size, unsigned int flags);
         int (*ah_setup_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
                 unsigned int, unsigned int, int, enum ath5k_pkt_type,
                 unsigned int, unsigned int, unsigned int, unsigned int,
                 unsigned int, unsigned int, unsigned int, unsigned int);
-        int (*ah_setup_mrr_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
-                unsigned int, unsigned int, unsigned int, unsigned int,
-                unsigned int, unsigned int);
         int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
                 struct ath5k_tx_status *);
         int (*ah_proc_rx_desc)(struct ath5k_hw *, struct ath5k_desc *,
@@ -1236,6 +1231,11 @@ int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time);
 
 /* Hardware Descriptor Functions */
 int ath5k_hw_init_desc_functions(struct ath5k_hw *ah);
+int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
+                           u32 size, unsigned int flags);
+int ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
+        unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,
+        u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3);
 
 /* GPIO Functions */
 void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state);
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 9d37c1a43a9d..20328bdd138b 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -311,7 +311,8 @@ static int 	ath5k_rxbuf_setup(struct ath5k_softc *sc,
 static int      ath5k_txbuf_setup(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf,
                                 struct ath5k_txq *txq, int padsize);
-static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
+
+static inline void ath5k_txbuf_free_skb(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf)
 {
         BUG_ON(!bf);
@@ -321,9 +322,11 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
                         PCI_DMA_TODEVICE);
         dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
+        bf->skbaddr = 0;
+        bf->desc->ds_data = 0;
 }
 
-static inline void ath5k_rxbuf_free(struct ath5k_softc *sc,
+static inline void ath5k_rxbuf_free_skb(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf)
 {
         struct ath5k_hw *ah = sc->ah;
@@ -336,6 +339,8 @@ static inline void ath5k_rxbuf_free(struct ath5k_softc *sc,
                         PCI_DMA_FROMDEVICE);
         dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
+        bf->skbaddr = 0;
+        bf->desc->ds_data = 0;
 }
 
 
@@ -352,7 +357,6 @@ static void 	ath5k_txq_release(struct ath5k_softc *sc);
 static int      ath5k_rx_start(struct ath5k_softc *sc);
 static void     ath5k_rx_stop(struct ath5k_softc *sc);
 static unsigned int ath5k_rx_decrypted(struct ath5k_softc *sc,
-                                        struct ath5k_desc *ds,
                                         struct sk_buff *skb,
                                         struct ath5k_rx_status *rs);
 static void     ath5k_tasklet_rx(unsigned long data);
@@ -765,7 +769,8 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
          * return false w/o doing anything.  MAC's that do
          * support it will return true w/o doing anything.
          */
-        ret = ah->ah_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
+        ret = ath5k_hw_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
+
         if (ret < 0)
                 goto err;
         if (ret > 0)
@@ -1111,8 +1116,9 @@ ath5k_setup_bands(struct ieee80211_hw *hw)
 static int
 ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 {
-        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -> (%u MHz)\n",
-                sc->curchan->center_freq, chan->center_freq);
+        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                  "channel set, resetting (%u -> %u MHz)\n",
+                  sc->curchan->center_freq, chan->center_freq);
 
         /*
          * To switch channels clear any pending DMA operations;
@@ -1228,21 +1234,23 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
          * not get overrun under high load (as can happen with a
          * 5212 when ANI processing enables PHY error frames).
          *
-         * To insure the last descriptor is self-linked we create
+         * To ensure the last descriptor is self-linked we create
          * each descriptor as self-linked and add it to the end.  As
          * each additional descriptor is added the previous self-linked
-         * entry is ``fixed'' naturally.  This should be safe even
+         * entry is "fixed" naturally.  This should be safe even
          * if DMA is happening.  When processing RX interrupts we
          * never remove/process the last, self-linked, entry on the
-         * descriptor list.  This insures the hardware always has
+         * descriptor list.  This ensures the hardware always has
          * someplace to write a new frame.
          */
         ds = bf->desc;
         ds->ds_link = bf->daddr;        /* link to self */
         ds->ds_data = bf->skbaddr;
-        ret = ah->ah_setup_rx_desc(ah, ds, ah->common.rx_bufsize, 0);
-        if (ret)
+        ret = ath5k_hw_setup_rx_desc(ah, ds, ah->common.rx_bufsize, 0);
+        if (ret) {
+                ATH5K_ERR(sc, "%s: could not setup RX desc\n", __func__);
                 return ret;
+        }
 
         if (sc->rxlink != NULL)
                 *sc->rxlink = bf->daddr;
@@ -1347,7 +1355,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
                 mrr_tries[i] = info->control.rates[i + 1].count;
         }
 
-        ah->ah_setup_mrr_tx_desc(ah, ds,
+        ath5k_hw_setup_mrr_tx_desc(ah, ds,
                 mrr_rate[0], mrr_tries[0],
                 mrr_rate[1], mrr_tries[1],
                 mrr_rate[2], mrr_tries[2]);
@@ -1443,17 +1451,20 @@ ath5k_desc_free(struct ath5k_softc *sc, struct pci_dev *pdev)
 {
         struct ath5k_buf *bf;
 
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
         list_for_each_entry(bf, &sc->txbuf, list)
-                ath5k_txbuf_free(sc, bf);
+                ath5k_txbuf_free_skb(sc, bf);
         list_for_each_entry(bf, &sc->rxbuf, list)
-                ath5k_rxbuf_free(sc, bf);
+                ath5k_rxbuf_free_skb(sc, bf);
 
         /* Free memory associated with all descriptors */
         pci_free_consistent(pdev, sc->desc_len, sc->desc, sc->desc_daddr);
+        sc->desc = NULL;
+        sc->desc_daddr = 0;
 
         kfree(sc->bufptr);
         sc->bufptr = NULL;
+        sc->bbuf = NULL;
 }
 
 
@@ -1602,7 +1613,7 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)
         list_for_each_entry_safe(bf, bf0, &txq->q, list) {
                 ath5k_debug_printtxbuf(sc, bf);
 
-                ath5k_txbuf_free(sc, bf);
+                ath5k_txbuf_free_skb(sc, bf);
 
                 spin_lock_bh(&sc->txbuflock);
                 list_move_tail(&bf->list, &sc->txbuf);
@@ -1721,8 +1732,8 @@ ath5k_rx_stop(struct ath5k_softc *sc)
 }
 
 static unsigned int
-ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
-                struct sk_buff *skb, struct ath5k_rx_status *rs)
+ath5k_rx_decrypted(struct ath5k_softc *sc, struct sk_buff *skb,
+                   struct ath5k_rx_status *rs)
 {
         struct ath5k_hw *ah = sc->ah;
         struct ath_common *common = ath5k_hw_common(ah);
@@ -1889,9 +1900,138 @@ static int ath5k_remove_padding(struct sk_buff *skb)
 }
 
 static void
-ath5k_tasklet_rx(unsigned long data)
+ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb,
+                    struct ath5k_rx_status *rs)
 {
         struct ieee80211_rx_status *rxs;
+
+        /* The MAC header is padded to have 32-bit boundary if the
+         * packet payload is non-zero. The general calculation for
+         * padsize would take into account odd header lengths:
+         * padsize = (4 - hdrlen % 4) % 4; However, since only
+         * even-length headers are used, padding can only be 0 or 2
+         * bytes and we can optimize this a bit. In addition, we must
+         * not try to remove padding from short control frames that do
+         * not have payload. */
+        ath5k_remove_padding(skb);
+
+        rxs = IEEE80211_SKB_RXCB(skb);
+
+        rxs->flag = 0;
+        if (unlikely(rs->rs_status & AR5K_RXERR_MIC))
+                rxs->flag |= RX_FLAG_MMIC_ERROR;
+
+        /*
+         * always extend the mac timestamp, since this information is
+         * also needed for proper IBSS merging.
+         *
+         * XXX: it might be too late to do it here, since rs_tstamp is
+         * 15bit only. that means TSF extension has to be done within
+         * 32768usec (about 32ms). it might be necessary to move this to
+         * the interrupt handler, like it is done in madwifi.
+         *
+         * Unfortunately we don't know when the hardware takes the rx
+         * timestamp (beginning of phy frame, data frame, end of rx?).
+         * The only thing we know is that it is hardware specific...
+         * On AR5213 it seems the rx timestamp is at the end of the
+         * frame, but i'm not sure.
+         *
+         * NOTE: mac80211 defines mactime at the beginning of the first
+         * data symbol. Since we don't have any time references it's
+         * impossible to comply to that. This affects IBSS merge only
+         * right now, so it's not too bad...
+         */
+        rxs->mactime = ath5k_extend_tsf(sc->ah, rs->rs_tstamp);
+        rxs->flag |= RX_FLAG_TSFT;
+
+        rxs->freq = sc->curchan->center_freq;
+        rxs->band = sc->curband->band;
+
+        rxs->signal = sc->ah->ah_noise_floor + rs->rs_rssi;
+
+        rxs->antenna = rs->rs_antenna;
+
+        if (rs->rs_antenna > 0 && rs->rs_antenna < 5)
+                sc->stats.antenna_rx[rs->rs_antenna]++;
+        else
+                sc->stats.antenna_rx[0]++; /* invalid */
+
+        rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs->rs_rate);
+        rxs->flag |= ath5k_rx_decrypted(sc, skb, rs);
+
+        if (rxs->rate_idx >= 0 && rs->rs_rate ==
+            sc->curband->bitrates[rxs->rate_idx].hw_value_short)
+                rxs->flag |= RX_FLAG_SHORTPRE;
+
+        ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
+
+        ath5k_update_beacon_rssi(sc, skb, rs->rs_rssi);
+
+        /* check beacons in IBSS mode */
+        if (sc->opmode == NL80211_IFTYPE_ADHOC)
+                ath5k_check_ibss_tsf(sc, skb, rxs);
+
+        ieee80211_rx(sc->hw, skb);
+}
+
+/** ath5k_frame_receive_ok() - Do we want to receive this frame or not?
+ *
+ * Check if we want to further process this frame or not. Also update
+ * statistics. Return true if we want this frame, false if not.
+ */
+static bool
+ath5k_receive_frame_ok(struct ath5k_softc *sc, struct ath5k_rx_status *rs)
+{
+        sc->stats.rx_all_count++;
+
+        if (unlikely(rs->rs_status)) {
+                if (rs->rs_status & AR5K_RXERR_CRC)
+                        sc->stats.rxerr_crc++;
+                if (rs->rs_status & AR5K_RXERR_FIFO)
+                        sc->stats.rxerr_fifo++;
+                if (rs->rs_status & AR5K_RXERR_PHY) {
+                        sc->stats.rxerr_phy++;
+                        if (rs->rs_phyerr > 0 && rs->rs_phyerr < 32)
+                                sc->stats.rxerr_phy_code[rs->rs_phyerr]++;
+                        return false;
+                }
+                if (rs->rs_status & AR5K_RXERR_DECRYPT) {
+                        /*
+                         * Decrypt error.  If the error occurred
+                         * because there was no hardware key, then
+                         * let the frame through so the upper layers
+                         * can process it.  This is necessary for 5210
+                         * parts which have no way to setup a ``clear''
+                         * key cache entry.
+                         *
+                         * XXX do key cache faulting
+                         */
+                        sc->stats.rxerr_decrypt++;
+                        if (rs->rs_keyix == AR5K_RXKEYIX_INVALID &&
+                            !(rs->rs_status & AR5K_RXERR_CRC))
+                                return true;
+                }
+                if (rs->rs_status & AR5K_RXERR_MIC) {
+                        sc->stats.rxerr_mic++;
+                        return true;
+                }
+
+                /* let crypto-error packets fall through in MNTR */
+                if ((rs->rs_status & ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
+                    sc->opmode != NL80211_IFTYPE_MONITOR)
+                        return false;
+        }
+
+        if (unlikely(rs->rs_more)) {
+                sc->stats.rxerr_jumbo++;
+                return false;
+        }
+        return true;
+}
+
+static void
+ath5k_tasklet_rx(unsigned long data)
+{
         struct ath5k_rx_status rs = {};
         struct sk_buff *skb, *next_skb;
         dma_addr_t next_skb_addr;
@@ -1901,7 +2041,6 @@ ath5k_tasklet_rx(unsigned long data)
         struct ath5k_buf *bf;
         struct ath5k_desc *ds;
         int ret;
-        int rx_flag;
 
         spin_lock(&sc->rxbuflock);
         if (list_empty(&sc->rxbuf)) {
@@ -1909,8 +2048,6 @@ ath5k_tasklet_rx(unsigned long data)
                 goto unlock;
         }
         do {
-                rx_flag = 0;
-
                 bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list);
                 BUG_ON(bf->skb == NULL);
                 skb = bf->skb;
@@ -1926,137 +2063,30 @@ ath5k_tasklet_rx(unsigned long data)
                 else if (unlikely(ret)) {
                         ATH5K_ERR(sc, "error in processing rx descriptor\n");
                         sc->stats.rxerr_proc++;
-                        spin_unlock(&sc->rxbuflock);
-                        return;
+                        break;
                 }
 
-                sc->stats.rx_all_count++;
-
-                if (unlikely(rs.rs_status)) {
-                        if (rs.rs_status & AR5K_RXERR_CRC)
-                                sc->stats.rxerr_crc++;
-                        if (rs.rs_status & AR5K_RXERR_FIFO)
-                                sc->stats.rxerr_fifo++;
-                        if (rs.rs_status & AR5K_RXERR_PHY) {
-                                sc->stats.rxerr_phy++;
-                                if (rs.rs_phyerr > 0 && rs.rs_phyerr < 32)
-                                        sc->stats.rxerr_phy_code[rs.rs_phyerr]++;
-                                goto next;
-                        }
-                        if (rs.rs_status & AR5K_RXERR_DECRYPT) {
-                                /*
-                                 * Decrypt error.  If the error occurred
-                                 * because there was no hardware key, then
-                                 * let the frame through so the upper layers
-                                 * can process it.  This is necessary for 5210
-                                 * parts which have no way to setup a ``clear''
-                                 * key cache entry.
-                                 *
-                                 * XXX do key cache faulting
-                                 */
-                                sc->stats.rxerr_decrypt++;
-                                if (rs.rs_keyix == AR5K_RXKEYIX_INVALID &&
-                                    !(rs.rs_status & AR5K_RXERR_CRC))
-                                        goto accept;
-                        }
-                        if (rs.rs_status & AR5K_RXERR_MIC) {
-                                rx_flag |= RX_FLAG_MMIC_ERROR;
-                                sc->stats.rxerr_mic++;
-                                goto accept;
-                        }
+                if (ath5k_receive_frame_ok(sc, &rs)) {
+                        next_skb = ath5k_rx_skb_alloc(sc, &next_skb_addr);
 
-                        /* let crypto-error packets fall through in MNTR */
-                        if ((rs.rs_status &
-                                ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
-                                        sc->opmode != NL80211_IFTYPE_MONITOR)
+                        /*
+                         * If we can't replace bf->skb with a new skb under
+                         * memory pressure, just skip this packet
+                         */
+                        if (!next_skb)
                                 goto next;
-                }
-
-                if (unlikely(rs.rs_more)) {
-                        sc->stats.rxerr_jumbo++;
-                        goto next;
 
-                }
-accept:
-                next_skb = ath5k_rx_skb_alloc(sc, &next_skb_addr);
+                        pci_unmap_single(sc->pdev, bf->skbaddr,
+                                         common->rx_bufsize,
+                                         PCI_DMA_FROMDEVICE);
 
-                /*
-                 * If we can't replace bf->skb with a new skb under memory
-                 * pressure, just skip this packet
-                 */
-                if (!next_skb)
-                        goto next;
-
-                pci_unmap_single(sc->pdev, bf->skbaddr, common->rx_bufsize,
-                                PCI_DMA_FROMDEVICE);
-                skb_put(skb, rs.rs_datalen);
-
-                /* The MAC header is padded to have 32-bit boundary if the
-                 * packet payload is non-zero. The general calculation for
-                 * padsize would take into account odd header lengths:
-                 * padsize = (4 - hdrlen % 4) % 4; However, since only
-                 * even-length headers are used, padding can only be 0 or 2
-                 * bytes and we can optimize this a bit. In addition, we must
-                 * not try to remove padding from short control frames that do
-                 * not have payload. */
-                ath5k_remove_padding(skb);
+                        skb_put(skb, rs.rs_datalen);
 
-                rxs = IEEE80211_SKB_RXCB(skb);
+                        ath5k_receive_frame(sc, skb, &rs);
 
-                /*
-                 * always extend the mac timestamp, since this information is
-                 * also needed for proper IBSS merging.
-                 *
-                 * XXX: it might be too late to do it here, since rs_tstamp is
-                 * 15bit only. that means TSF extension has to be done within
-                 * 32768usec (about 32ms). it might be necessary to move this to
-                 * the interrupt handler, like it is done in madwifi.
-                 *
-                 * Unfortunately we don't know when the hardware takes the rx
-                 * timestamp (beginning of phy frame, data frame, end of rx?).
-                 * The only thing we know is that it is hardware specific...
-                 * On AR5213 it seems the rx timestamp is at the end of the
-                 * frame, but i'm not sure.
-                 *
-                 * NOTE: mac80211 defines mactime at the beginning of the first
-                 * data symbol. Since we don't have any time references it's
-                 * impossible to comply to that. This affects IBSS merge only
-                 * right now, so it's not too bad...
-                 */
-                rxs->mactime = ath5k_extend_tsf(sc->ah, rs.rs_tstamp);
-                rxs->flag = rx_flag | RX_FLAG_TSFT;
-
-                rxs->freq = sc->curchan->center_freq;
-                rxs->band = sc->curband->band;
-
-                rxs->signal = sc->ah->ah_noise_floor + rs.rs_rssi;
-
-                rxs->antenna = rs.rs_antenna;
-
-                if (rs.rs_antenna > 0 && rs.rs_antenna < 5)
-                        sc->stats.antenna_rx[rs.rs_antenna]++;
-                else
-                        sc->stats.antenna_rx[0]++; /* invalid */
-
-                rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
-                rxs->flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
-
-                if (rxs->rate_idx >= 0 && rs.rs_rate ==
-                    sc->curband->bitrates[rxs->rate_idx].hw_value_short)
-                        rxs->flag |= RX_FLAG_SHORTPRE;
-
-                ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
-
-                ath5k_update_beacon_rssi(sc, skb, rs.rs_rssi);
-
-                /* check beacons in IBSS mode */
-                if (sc->opmode == NL80211_IFTYPE_ADHOC)
-                        ath5k_check_ibss_tsf(sc, skb, rxs);
-
-                ieee80211_rx(sc->hw, skb);
-
-                bf->skb = next_skb;
-                bf->skbaddr = next_skb_addr;
+                        bf->skb = next_skb;
+                        bf->skbaddr = next_skb_addr;
+                }
 next:
                 list_move_tail(&bf->list, &sc->rxbuf);
         } while (ath5k_rxbuf_setup(sc, bf) == 0);
@@ -2065,8 +2095,6 @@ unlock:
 }
 
 
-
-
 /*************\
 * TX Handling *
 \*************/
@@ -2298,6 +2326,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                         ATH5K_DBG(sc, ATH5K_DEBUG_BEACON,
                                 "stuck beacon time (%u missed)\n",
                                 sc->bmisscount);
+                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                  "stuck beacon, resetting\n");
                         tasklet_schedule(&sc->restq);
                 }
                 return;
@@ -2647,7 +2677,7 @@ ath5k_stop_hw(struct ath5k_softc *sc)
                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
                                 "putting device to sleep\n");
         }
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
 
         mmiowb();
         mutex_unlock(&sc->lock);
@@ -2705,6 +2735,8 @@ ath5k_intr(int irq, void *dev_id)
                          * Fatal errors are unrecoverable.
                          * Typically these are caused by DMA errors.
                          */
+                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                  "fatal int, resetting\n");
                         tasklet_schedule(&sc->restq);
                 } else if (unlikely(status & AR5K_INT_RXORN)) {
                         /*
@@ -2717,8 +2749,11 @@ ath5k_intr(int irq, void *dev_id)
                          * this guess is copied from the HAL.
                          */
                         sc->stats.rxorn_intr++;
-                        if (ah->ah_mac_srev < AR5K_SREV_AR5212)
+                        if (ah->ah_mac_srev < AR5K_SREV_AR5212) {
+                                ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                          "rx overrun, resetting\n");
                                 tasklet_schedule(&sc->restq);
+                        }
                         else
                                 tasklet_schedule(&sc->rxtq);
                 } else {
@@ -3368,7 +3403,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
         ath5k_debug_dump_skb(sc, skb, "BC  ", 1);
 
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
         sc->bbuf->skb = skb;
         ret = ath5k_beacon_setup(sc, sc->bbuf);
         if (ret)
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 0f2e37d85cbd..8c638865c712 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -278,6 +278,7 @@ static ssize_t write_file_reset(struct file *file,
                                  size_t count, loff_t *ppos)
 {
         struct ath5k_softc *sc = file->private_data;
+        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "debug file triggered reset\n");
         tasklet_schedule(&sc->restq);
         return count;
 }
@@ -924,7 +925,7 @@ ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done,
                 ds, (unsigned long long)bf->daddr,
                 ds->ds_link, ds->ds_data,
                 rd->rx_ctl.rx_control_0, rd->rx_ctl.rx_control_1,
-                rd->u.rx_stat.rx_status_0, rd->u.rx_stat.rx_status_0,
+                rd->rx_stat.rx_status_0, rd->rx_stat.rx_status_1,
                 !done ? ' ' : (rs->rs_status == 0) ? '*' : '!');
 }
 
@@ -939,7 +940,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
         if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
                 return;
 
-        printk(KERN_DEBUG "rx queue %x, link %p\n",
+        printk(KERN_DEBUG "rxdp %x, rxlink %p\n",
                 ath5k_hw_get_rxdp(ah), sc->rxlink);
 
         spin_lock_bh(&sc->rxbuflock);
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index da5dbb63047f..43244382f213 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -91,14 +91,13 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         tx_ctl->tx_control_1 = pkt_len & AR5K_2W_TX_DESC_CTL1_BUF_LEN;
 
         /*
-         * Verify and set header length
-         * XXX: I only found that on 5210 code, does it work on 5211 ?
+         * Verify and set header length (only 5210)
          */
         if (ah->ah_version == AR5K_AR5210) {
-                if (hdr_len & ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN)
+                if (hdr_len & ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210)
                         return -EINVAL;
                 tx_ctl->tx_control_0 |=
-                        AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN);
+                        AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210);
         }
 
         /*Differences between 5210-5211*/
@@ -110,11 +109,11 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                 case AR5K_PKT_TYPE_PIFS:
                         frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS;
                 default:
-                        frame_type = type /*<< 2 ?*/;
+                        frame_type = type;
                 }
 
                 tx_ctl->tx_control_0 |=
-                AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE) |
+                AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210) |
                 AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE);
 
         } else {
@@ -123,21 +122,30 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         AR5K_REG_SM(antenna_mode,
                                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT);
                 tx_ctl->tx_control_1 |=
-                        AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE);
+                        AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211);
         }
+
 #define _TX_FLAGS(_c, _flag)                                    \
         if (flags & AR5K_TXDESC_##_flag) {                      \
                 tx_ctl->tx_control_##_c |=                      \
                         AR5K_2W_TX_DESC_CTL##_c##_##_flag;      \
         }
-
+#define _TX_FLAGS_5211(_c, _flag)                                       \
+        if (flags & AR5K_TXDESC_##_flag) {                              \
+                tx_ctl->tx_control_##_c |=                              \
+                        AR5K_2W_TX_DESC_CTL##_c##_##_flag##_5211;       \
+        }
         _TX_FLAGS(0, CLRDMASK);
-        _TX_FLAGS(0, VEOL);
         _TX_FLAGS(0, INTREQ);
         _TX_FLAGS(0, RTSENA);
-        _TX_FLAGS(1, NOACK);
+
+        if (ah->ah_version == AR5K_AR5211) {
+                _TX_FLAGS_5211(0, VEOL);
+                _TX_FLAGS_5211(1, NOACK);
+        }
 
 #undef _TX_FLAGS
+#undef _TX_FLAGS_5211
 
         /*
          * WEP crap
@@ -147,7 +155,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
                 tx_ctl->tx_control_1 |=
                         AR5K_REG_SM(key_index,
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX);
         }
 
         /*
@@ -156,7 +164,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         if ((ah->ah_version == AR5K_AR5210) &&
                         (flags & (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)))
                 tx_ctl->tx_control_1 |= rtscts_duration &
-                                AR5K_2W_TX_DESC_CTL1_RTS_DURATION;
+                                AR5K_2W_TX_DESC_CTL1_RTS_DURATION_5210;
 
         return 0;
 }
@@ -255,7 +263,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         if (key_index != AR5K_TXKEYIX_INVALID) {
                 tx_ctl->tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
                 tx_ctl->tx_control_1 |= AR5K_REG_SM(key_index,
-                                AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
+                                AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX);
         }
 
         /*
@@ -277,13 +285,17 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
 /*
  * Initialize a 4-word multi rate retry tx control descriptor on 5212
  */
-static int
+int
 ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,
         u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3)
 {
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
 
+        /* no mrr support for cards older than 5212 */
+        if (ah->ah_version < AR5K_AR5212)
+                return 0;
+
         /*
          * Rates can be 0 as long as the retry count is 0 too.
          * A zero rate and nonzero retry count will put the HW into a mode where
@@ -323,15 +335,6 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         return 0;
 }
 
-/* no mrr support for cards older than 5212 */
-static int
-ath5k_hw_setup_no_mrr(struct ath5k_hw *ah, struct ath5k_desc *desc,
-        unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,
-        u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3)
-{
-        return 0;
-}
-
 /*
  * Proccess the tx status descriptor on 5210/5211
  */
@@ -414,11 +417,11 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
         ts->ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);
         ts->ts_antenna = (tx_status->tx_status_1 &
-                AR5K_DESC_TX_STATUS1_XMIT_ANTENNA) ? 2 : 1;
+                AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212) ? 2 : 1;
         ts->ts_status = 0;
 
         ts->ts_final_idx = AR5K_REG_MS(tx_status->tx_status_1,
-                        AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX);
+                        AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212);
 
         /* The longretry counter has the number of un-acked retries
          * for the final rate. To get the total number of retries
@@ -480,8 +483,8 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
 /*
  * Initialize an rx control descriptor
  */
-static int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
-                        u32 size, unsigned int flags)
+int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
+                           u32 size, unsigned int flags)
 {
         struct ath5k_hw_rx_ctl *rx_ctl;
 
@@ -496,10 +499,11 @@ static int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         */
         memset(&desc->ud.ds_rx, 0, sizeof(struct ath5k_hw_all_rx_desc));
 
+        if (unlikely(size & ~AR5K_DESC_RX_CTL1_BUF_LEN))
+                return -EINVAL;
+
         /* Setup descriptor */
         rx_ctl->rx_control_1 = size & AR5K_DESC_RX_CTL1_BUF_LEN;
-        if (unlikely(rx_ctl->rx_control_1 != size))
-                return -EINVAL;
 
         if (flags & AR5K_RXDESC_INTREQ)
                 rx_ctl->rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;
@@ -515,13 +519,15 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
 {
         struct ath5k_hw_rx_status *rx_status;
 
-        rx_status = &desc->ud.ds_rx.u.rx_stat;
+        rx_status = &desc->ud.ds_rx.rx_stat;
 
         /* No frame received / not ready */
         if (unlikely(!(rx_status->rx_status_1 &
-        AR5K_5210_RX_DESC_STATUS1_DONE)))
+                        AR5K_5210_RX_DESC_STATUS1_DONE)))
                 return -EINPROGRESS;
 
+        memset(rs, 0, sizeof(struct ath5k_rx_status));
+
         /*
          * Frame receive status
          */
@@ -531,15 +537,23 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);
         rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);
-        rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA);
         rs->rs_more = !!(rx_status->rx_status_0 &
                 AR5K_5210_RX_DESC_STATUS0_MORE);
-        /* TODO: this timestamp is 13 bit, later on we assume 15 bit */
+        /* TODO: this timestamp is 13 bit, later on we assume 15 bit!
+         * also the HAL code for 5210 says the timestamp is bits [10..22] of the
+         * TSF, and extends the timestamp here to 15 bit.
+         * we need to check on 5210...
+         */
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        rs->rs_status = 0;
-        rs->rs_phyerr = 0;
+
+        if (ah->ah_version == AR5K_AR5211)
+                rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
+                                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211);
+        else
+                rs->rs_antenna = (rx_status->rx_status_0 &
+                                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5210)
+                                ? 2 : 1;
 
         /*
          * Key table status
@@ -554,19 +568,21 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
          * Receive/descriptor errors
          */
         if (!(rx_status->rx_status_1 &
-        AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
+                        AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
                 if (rx_status->rx_status_1 &
                                 AR5K_5210_RX_DESC_STATUS1_CRC_ERROR)
                         rs->rs_status |= AR5K_RXERR_CRC;
 
-                if (rx_status->rx_status_1 &
-                                AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN)
+                /* only on 5210 */
+                if ((ah->ah_version == AR5K_AR5210) &&
+                    (rx_status->rx_status_1 &
+                                AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN_5210))
                         rs->rs_status |= AR5K_RXERR_FIFO;
 
                 if (rx_status->rx_status_1 &
                                 AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) {
                         rs->rs_status |= AR5K_RXERR_PHY;
-                        rs->rs_phyerr |= AR5K_REG_MS(rx_status->rx_status_1,
+                        rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1,
                                 AR5K_5210_RX_DESC_STATUS1_PHY_ERROR);
                 }
 
@@ -582,21 +598,20 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
  * Proccess the rx status descriptor on 5212
  */
 static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc, struct ath5k_rx_status *rs)
+                                        struct ath5k_desc *desc,
+                                        struct ath5k_rx_status *rs)
 {
         struct ath5k_hw_rx_status *rx_status;
-        struct ath5k_hw_rx_error *rx_err;
-
-        rx_status = &desc->ud.ds_rx.u.rx_stat;
 
-        /* Overlay on error */
-        rx_err = &desc->ud.ds_rx.u.rx_err;
+        rx_status = &desc->ud.ds_rx.rx_stat;
 
         /* No frame received / not ready */
         if (unlikely(!(rx_status->rx_status_1 &
-        AR5K_5212_RX_DESC_STATUS1_DONE)))
+                                AR5K_5212_RX_DESC_STATUS1_DONE)))
                 return -EINPROGRESS;
 
+        memset(rs, 0, sizeof(struct ath5k_rx_status));
+
         /*
          * Frame receive status
          */
@@ -612,15 +627,13 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                 AR5K_5212_RX_DESC_STATUS0_MORE);
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        rs->rs_status = 0;
-        rs->rs_phyerr = 0;
 
         /*
          * Key table status
          */
         if (rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)
                 rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
-                                AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
+                                           AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
         else
                 rs->rs_keyix = AR5K_RXKEYIX_INVALID;
 
@@ -628,7 +641,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
          * Receive/descriptor errors
          */
         if (!(rx_status->rx_status_1 &
-        AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
+            AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
                 if (rx_status->rx_status_1 &
                                 AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)
                         rs->rs_status |= AR5K_RXERR_CRC;
@@ -636,9 +649,10 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                 if (rx_status->rx_status_1 &
                                 AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {
                         rs->rs_status |= AR5K_RXERR_PHY;
-                        rs->rs_phyerr |= AR5K_REG_MS(rx_err->rx_error_1,
-                                           AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);
-                        ath5k_ani_phy_error_report(ah, rs->rs_phyerr);
+                        rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1,
+                                AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE);
+                        if (!ah->ah_capabilities.cap_has_phyerr_counters)
+                                ath5k_ani_phy_error_report(ah, rs->rs_phyerr);
                 }
 
                 if (rx_status->rx_status_1 &
@@ -649,7 +663,6 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                                 AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)
                         rs->rs_status |= AR5K_RXERR_MIC;
         }
-
         return 0;
 }
 
@@ -658,29 +671,15 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
  */
 int ath5k_hw_init_desc_functions(struct ath5k_hw *ah)
 {
-
-        if (ah->ah_version != AR5K_AR5210 &&
-                ah->ah_version != AR5K_AR5211 &&
-                ah->ah_version != AR5K_AR5212)
-                        return -ENOTSUPP;
-
         if (ah->ah_version == AR5K_AR5212) {
-                ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc;
                 ah->ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;
-                ah->ah_setup_mrr_tx_desc = ath5k_hw_setup_mrr_tx_desc;
                 ah->ah_proc_tx_desc = ath5k_hw_proc_4word_tx_status;
-        } else {
-                ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc;
+                ah->ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;
+        } else if (ah->ah_version <= AR5K_AR5211) {
                 ah->ah_setup_tx_desc = ath5k_hw_setup_2word_tx_desc;
-                ah->ah_setup_mrr_tx_desc = ath5k_hw_setup_no_mrr;
                 ah->ah_proc_tx_desc = ath5k_hw_proc_2word_tx_status;
-        }
-
-        if (ah->ah_version == AR5K_AR5212)
-                ah->ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;
-        else if (ah->ah_version <= AR5K_AR5211)
                 ah->ah_proc_rx_desc = ath5k_hw_proc_5210_rx_status;
-
+        } else
+                return -ENOTSUPP;
         return 0;
 }
-
diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h
index 64538fbe4167..b2adb2a281c2 100644
--- a/drivers/net/wireless/ath/ath5k/desc.h
+++ b/drivers/net/wireless/ath/ath5k/desc.h
@@ -17,28 +17,24 @@
  */
 
 /*
- * Internal RX/TX descriptor structures
- * (rX: reserved fields possibily used by future versions of the ar5k chipset)
+ * RX/TX descriptor structures
  */
 
 /*
- * common hardware RX control descriptor
+ * Common hardware RX control descriptor
  */
 struct ath5k_hw_rx_ctl {
         u32     rx_control_0; /* RX control word 0 */
         u32     rx_control_1; /* RX control word 1 */
 } __packed;
 
-/* RX control word 0 field/sflags */
-#define AR5K_DESC_RX_CTL0                       0x00000000
-
 /* RX control word 1 fields/flags */
-#define AR5K_DESC_RX_CTL1_BUF_LEN               0x00000fff
-#define AR5K_DESC_RX_CTL1_INTREQ                0x00002000
+#define AR5K_DESC_RX_CTL1_BUF_LEN               0x00000fff /* data buffer length */
+#define AR5K_DESC_RX_CTL1_INTREQ                0x00002000 /* RX interrupt request */
 
 /*
- * common hardware RX status descriptor
- * 5210/11 and 5212 differ only in the flags defined below
+ * Common hardware RX status descriptor
+ * 5210, 5211 and 5212 differ only in the fields and flags defined below
  */
 struct ath5k_hw_rx_status {
         u32     rx_status_0; /* RX status word 0 */
@@ -47,81 +43,69 @@ struct ath5k_hw_rx_status {
 
 /* 5210/5211 */
 /* RX status word 0 fields/flags */
-#define AR5K_5210_RX_DESC_STATUS0_DATA_LEN              0x00000fff
-#define AR5K_5210_RX_DESC_STATUS0_MORE                  0x00001000
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE          0x00078000
+#define AR5K_5210_RX_DESC_STATUS0_DATA_LEN              0x00000fff /* RX data length */
+#define AR5K_5210_RX_DESC_STATUS0_MORE                  0x00001000 /* more desc for this frame */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5210      0x00004000 /* [5210] receive on ant 1 */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE          0x00078000 /* reception rate */
 #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE_S        15
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x07f80000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x07f80000 /* rssi */
 #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      19
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA       0x38000000
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     27
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211      0x38000000 /* [5211] receive antenna */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211_S    27
 
 /* RX status word 1 fields/flags */
-#define AR5K_5210_RX_DESC_STATUS1_DONE                  0x00000001
-#define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
-#define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR             0x00000004
-#define AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN          0x00000008
-#define AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000010
-#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR             0x000000e0
+#define AR5K_5210_RX_DESC_STATUS1_DONE                  0x00000001 /* descriptor complete */
+#define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002 /* reception success */
+#define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR             0x00000004 /* CRC error */
+#define AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN_5210     0x00000008 /* [5210] FIFO overrun */
+#define AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000010 /* decyption CRC failure */
+#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR             0x000000e0 /* PHY error */
 #define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR_S           5
-#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
-#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX             0x00007e00
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100 /* key index valid */
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX             0x00007e00 /* decyption key index */
 #define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_S           9
-#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x0fff8000
+#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x0fff8000 /* 13 bit of TSF */
 #define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   15
-#define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS        0x10000000
+#define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS        0x10000000 /* key cache miss */
 
 /* 5212 */
 /* RX status word 0 fields/flags */
-#define AR5K_5212_RX_DESC_STATUS0_DATA_LEN              0x00000fff
-#define AR5K_5212_RX_DESC_STATUS0_MORE                  0x00001000
-#define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR      0x00002000
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE          0x000f8000
+#define AR5K_5212_RX_DESC_STATUS0_DATA_LEN              0x00000fff /* RX data length */
+#define AR5K_5212_RX_DESC_STATUS0_MORE                  0x00001000 /* more desc for this frame */
+#define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR      0x00002000 /* decompression CRC error */
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE          0x000f8000 /* reception rate */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE_S        15
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x0ff00000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x0ff00000 /* rssi */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      20
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA       0xf0000000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA       0xf0000000 /* receive antenna */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     28
 
 /* RX status word 1 fields/flags */
-#define AR5K_5212_RX_DESC_STATUS1_DONE                  0x00000001
-#define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
-#define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR             0x00000004
-#define AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000008
-#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR             0x00000010
-#define AR5K_5212_RX_DESC_STATUS1_MIC_ERROR             0x00000020
-#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
-#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX             0x0000fe00
+#define AR5K_5212_RX_DESC_STATUS1_DONE                  0x00000001 /* descriptor complete */
+#define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002 /* frame reception success */
+#define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR             0x00000004 /* CRC error */
+#define AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000008 /* decryption CRC failure */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR             0x00000010 /* PHY error */
+#define AR5K_5212_RX_DESC_STATUS1_MIC_ERROR             0x00000020 /* MIC decrypt error */
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100 /* key index valid */
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX             0x0000fe00 /* decryption key index */
 #define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_S           9
-#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x7fff0000
+#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x7fff0000 /* first 15bit of the TSF */
 #define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   16
-#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS        0x80000000
-
-/*
- * common hardware RX error descriptor
- */
-struct ath5k_hw_rx_error {
-        u32     rx_error_0; /* RX status word 0 */
-        u32     rx_error_1; /* RX status word 1 */
-} __packed;
-
-/* RX error word 0 fields/flags */
-#define AR5K_RX_DESC_ERROR0                     0x00000000
-
-/* RX error word 1 fields/flags */
-#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE      0x0000ff00
-#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S    8
+#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS        0x80000000 /* key cache miss */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE        0x0000ff00 /* phy error code overlays key index and valid fields */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE_S      8
 
 /**
  * enum ath5k_phy_error_code - PHY Error codes
  */
 enum ath5k_phy_error_code {
-        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,    /* Transmit underrun */
+        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,    /* Transmit underrun, [5210] No error */
         AR5K_RX_PHY_ERROR_TIMING                = 1,    /* Timing error */
         AR5K_RX_PHY_ERROR_PARITY                = 2,    /* Illegal parity */
         AR5K_RX_PHY_ERROR_RATE                  = 3,    /* Illegal rate */
         AR5K_RX_PHY_ERROR_LENGTH                = 4,    /* Illegal length */
-        AR5K_RX_PHY_ERROR_RADAR                 = 5,    /* Radar detect */
+        AR5K_RX_PHY_ERROR_RADAR                 = 5,    /* Radar detect, [5210] 64 QAM rate */
         AR5K_RX_PHY_ERROR_SERVICE               = 6,    /* Illegal service */
         AR5K_RX_PHY_ERROR_TOR                   = 7,    /* Transmit override receive */
         /* these are specific to the 5212 */
@@ -148,112 +132,111 @@ struct ath5k_hw_2w_tx_ctl {
 } __packed;
 
 /* TX control word 0 fields/flags */
-#define AR5K_2W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
-#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN         0x0003f000 /*[5210 ?]*/
-#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_S       12
-#define AR5K_2W_TX_DESC_CTL0_XMIT_RATE          0x003c0000
+#define AR5K_2W_TX_DESC_CTL0_FRAME_LEN          0x00000fff /* frame length */
+#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210    0x0003f000 /* [5210] header length */
+#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210_S  12
+#define AR5K_2W_TX_DESC_CTL0_XMIT_RATE          0x003c0000 /* tx rate */
 #define AR5K_2W_TX_DESC_CTL0_XMIT_RATE_S        18
-#define AR5K_2W_TX_DESC_CTL0_RTSENA             0x00400000
-#define AR5K_2W_TX_DESC_CTL0_CLRDMASK           0x01000000
-#define AR5K_2W_TX_DESC_CTL0_LONG_PACKET        0x00800000 /*[5210]*/
-#define AR5K_2W_TX_DESC_CTL0_VEOL               0x00800000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE         0x1c000000 /*[5210]*/
-#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_S       26
-#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 0x02000000
-#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211 0x1e000000
-
+#define AR5K_2W_TX_DESC_CTL0_RTSENA             0x00400000 /* RTS/CTS enable */
+#define AR5K_2W_TX_DESC_CTL0_LONG_PACKET_5210   0x00800000 /* [5210] long packet */
+#define AR5K_2W_TX_DESC_CTL0_VEOL_5211          0x00800000 /* [5211] virtual end-of-list */
+#define AR5K_2W_TX_DESC_CTL0_CLRDMASK           0x01000000 /* clear destination mask */
+#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 0x02000000 /* [5210] antenna selection */
+#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211 0x1e000000 /* [5211] antenna selection */
 #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT                      \
                 (ah->ah_version == AR5K_AR5210 ?                \
                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 :       \
                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211)
-
 #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_S    25
-#define AR5K_2W_TX_DESC_CTL0_INTREQ             0x20000000
-#define AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000
+#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210    0x1c000000 /* [5210] frame type */
+#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210_S  26
+#define AR5K_2W_TX_DESC_CTL0_INTREQ             0x20000000 /* TX interrupt request */
+#define AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000 /* key is valid */
 
 /* TX control word 1 fields/flags */
-#define AR5K_2W_TX_DESC_CTL1_BUF_LEN            0x00000fff
-#define AR5K_2W_TX_DESC_CTL1_MORE               0x00001000
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210     0x0007e000
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211     0x000fe000
-
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX                          \
+#define AR5K_2W_TX_DESC_CTL1_BUF_LEN            0x00000fff /* data buffer length */
+#define AR5K_2W_TX_DESC_CTL1_MORE               0x00001000 /* more desc for this frame */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5210   0x0007e000 /* [5210] key table index */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5211   0x000fe000 /* [5211] key table index */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX                                \
                         (ah->ah_version == AR5K_AR5210 ?                \
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210 :   \
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211)
-
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_S        13
-#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE         0x00700000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_S       20
-#define AR5K_2W_TX_DESC_CTL1_NOACK              0x00800000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL1_RTS_DURATION       0xfff80000 /*[5210 ?]*/
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5210 :         \
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5211)
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_S      13
+#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211    0x00700000 /* [5211] frame type */
+#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211_S  20
+#define AR5K_2W_TX_DESC_CTL1_NOACK_5211         0x00800000 /* [5211] no ACK */
+#define AR5K_2W_TX_DESC_CTL1_RTS_DURATION_5210  0xfff80000 /* [5210] lower 13 bit of duration */
 
 /* Frame types */
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL   0x00
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM     0x04
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL   0x08
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 0x0c
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS     0x10
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL   0
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM     1
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL   2
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 3
+#define AR5K_AR5211_TX_DESC_FRAME_TYPE_BEACON   3
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS     4
+#define AR5K_AR5211_TX_DESC_FRAME_TYPE_PRESP    4
 
 /*
  * 5212 hardware 4-word TX control descriptor
  */
 struct ath5k_hw_4w_tx_ctl {
         u32     tx_control_0; /* TX control word 0 */
+        u32     tx_control_1; /* TX control word 1 */
+        u32     tx_control_2; /* TX control word 2 */
+        u32     tx_control_3; /* TX control word 3 */
+} __packed;
 
-#define AR5K_4W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
-#define AR5K_4W_TX_DESC_CTL0_XMIT_POWER         0x003f0000
+/* TX control word 0 fields/flags */
+#define AR5K_4W_TX_DESC_CTL0_FRAME_LEN          0x00000fff /* frame length */
+#define AR5K_4W_TX_DESC_CTL0_XMIT_POWER         0x003f0000 /* transmit power */
 #define AR5K_4W_TX_DESC_CTL0_XMIT_POWER_S       16
-#define AR5K_4W_TX_DESC_CTL0_RTSENA             0x00400000
-#define AR5K_4W_TX_DESC_CTL0_VEOL               0x00800000
-#define AR5K_4W_TX_DESC_CTL0_CLRDMASK           0x01000000
-#define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT      0x1e000000
+#define AR5K_4W_TX_DESC_CTL0_RTSENA             0x00400000 /* RTS/CTS enable */
+#define AR5K_4W_TX_DESC_CTL0_VEOL               0x00800000 /* virtual end-of-list */
+#define AR5K_4W_TX_DESC_CTL0_CLRDMASK           0x01000000 /* clear destination mask */
+#define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT      0x1e000000 /* TX antenna selection */
 #define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT_S    25
-#define AR5K_4W_TX_DESC_CTL0_INTREQ             0x20000000
-#define AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000
-#define AR5K_4W_TX_DESC_CTL0_CTSENA             0x80000000
-
-        u32     tx_control_1; /* TX control word 1 */
+#define AR5K_4W_TX_DESC_CTL0_INTREQ             0x20000000 /* TX interrupt request */
+#define AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000 /* destination index valid */
+#define AR5K_4W_TX_DESC_CTL0_CTSENA             0x80000000 /* precede frame with CTS */
 
-#define AR5K_4W_TX_DESC_CTL1_BUF_LEN            0x00000fff
-#define AR5K_4W_TX_DESC_CTL1_MORE               0x00001000
-#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX  0x000fe000
-#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_S        13
-#define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE         0x00f00000
+/* TX control word 1 fields/flags */
+#define AR5K_4W_TX_DESC_CTL1_BUF_LEN            0x00000fff /* data buffer length */
+#define AR5K_4W_TX_DESC_CTL1_MORE               0x00001000 /* more desc for this frame */
+#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX    0x000fe000 /* destination table index */
+#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX_S  13
+#define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE         0x00f00000 /* frame type */
 #define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE_S       20
-#define AR5K_4W_TX_DESC_CTL1_NOACK              0x01000000
-#define AR5K_4W_TX_DESC_CTL1_COMP_PROC          0x06000000
+#define AR5K_4W_TX_DESC_CTL1_NOACK              0x01000000 /* no ACK */
+#define AR5K_4W_TX_DESC_CTL1_COMP_PROC          0x06000000 /* compression processing */
 #define AR5K_4W_TX_DESC_CTL1_COMP_PROC_S        25
-#define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN        0x18000000
+#define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN        0x18000000 /* length of frame IV */
 #define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN_S      27
-#define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN       0x60000000
+#define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN       0x60000000 /* length of frame ICV */
 #define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN_S     29
 
-        u32     tx_control_2; /* TX control word 2 */
-
-#define AR5K_4W_TX_DESC_CTL2_RTS_DURATION               0x00007fff
-#define AR5K_4W_TX_DESC_CTL2_DURATION_UPDATE_ENABLE     0x00008000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0                0x000f0000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0_S              16
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1                0x00f00000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1_S              20
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2                0x0f000000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2_S              24
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3                0xf0000000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3_S              28
-
-        u32     tx_control_3; /* TX control word 3 */
-
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE0         0x0000001f
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1         0x000003e0
+/* TX control word 2 fields/flags */
+#define AR5K_4W_TX_DESC_CTL2_RTS_DURATION       0x00007fff /* RTS/CTS duration */
+#define AR5K_4W_TX_DESC_CTL2_DURATION_UPD_EN    0x00008000 /* frame duration update */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0        0x000f0000 /* series 0 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0_S      16
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1        0x00f00000 /* series 1 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1_S      20
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2        0x0f000000 /* series 2 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2_S      24
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3        0xf0000000 /* series 3 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3_S      28
+
+/* TX control word 3 fields/flags */
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE0         0x0000001f /* series 0 tx rate */
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1         0x000003e0 /* series 1 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1_S       5
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2         0x00007c00
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2         0x00007c00 /* series 2 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2_S       10
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3         0x000f8000
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3         0x000f8000 /* series 3 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3_S       15
-#define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE       0x01f00000
+#define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE       0x01f00000 /* RTS or CTS rate */
 #define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE_S     20
-} __packed;
 
 /*
  * Common TX status descriptor
@@ -264,37 +247,34 @@ struct ath5k_hw_tx_status {
 } __packed;
 
 /* TX status word 0 fields/flags */
-#define AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK      0x00000001
-#define AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES  0x00000002
-#define AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN      0x00000004
-#define AR5K_DESC_TX_STATUS0_FILTERED           0x00000008
-/*???
-#define AR5K_DESC_TX_STATUS0_RTS_FAIL_COUNT     0x000000f0
-#define AR5K_DESC_TX_STATUS0_RTS_FAIL_COUNT_S   4
-*/
-#define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT  0x000000f0
+#define AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK      0x00000001 /* TX success */
+#define AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES  0x00000002 /* excessive retries */
+#define AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN      0x00000004 /* FIFO underrun */
+#define AR5K_DESC_TX_STATUS0_FILTERED           0x00000008 /* TX filter indication */
+/* according to the HAL sources the spec has short/long retry counts reversed.
+ * we have it reversed to the HAL sources as well, for 5210 and 5211.
+ * For 5212 these fields are defined as RTS_FAIL_COUNT and DATA_FAIL_COUNT,
+ * but used respectively as SHORT and LONG retry count in the code later. This
+ * is consistent with the definitions here... TODO: check */
+#define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT  0x000000f0 /* short retry count */
 #define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT_S        4
-/*???
-#define AR5K_DESC_TX_STATUS0_DATA_FAIL_COUNT    0x00000f00
-#define AR5K_DESC_TX_STATUS0_DATA_FAIL_COUNT_S  8
-*/
-#define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT   0x00000f00
+#define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT   0x00000f00 /* long retry count */
 #define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT_S 8
-#define AR5K_DESC_TX_STATUS0_VIRT_COLL_COUNT    0x0000f000
-#define AR5K_DESC_TX_STATUS0_VIRT_COLL_COUNT_S  12
-#define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP     0xffff0000
+#define AR5K_DESC_TX_STATUS0_VIRTCOLL_CT_5211   0x0000f000 /* [5211+] virtual collision count */
+#define AR5K_DESC_TX_STATUS0_VIRTCOLL_CT_5212_S 12
+#define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP     0xffff0000 /* TX timestamp */
 #define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP_S   16
 
 /* TX status word 1 fields/flags */
-#define AR5K_DESC_TX_STATUS1_DONE               0x00000001
-#define AR5K_DESC_TX_STATUS1_SEQ_NUM            0x00001ffe
+#define AR5K_DESC_TX_STATUS1_DONE               0x00000001 /* descriptor complete */
+#define AR5K_DESC_TX_STATUS1_SEQ_NUM            0x00001ffe /* TX sequence number */
 #define AR5K_DESC_TX_STATUS1_SEQ_NUM_S          1
-#define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH   0x001fe000
+#define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH   0x001fe000 /* signal strength of ACK */
 #define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH_S 13
-#define AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX     0x00600000
-#define AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX_S   21
-#define AR5K_DESC_TX_STATUS1_COMP_SUCCESS       0x00800000
-#define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA       0x01000000
+#define AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212   0x00600000 /* [5212] final TX attempt series ix */
+#define AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212_S 21
+#define AR5K_DESC_TX_STATUS1_COMP_SUCCESS_5212  0x00800000 /* [5212] compression status */
+#define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212  0x01000000 /* [5212] transmit antenna */
 
 /*
  * 5210/5211 hardware TX descriptor
@@ -313,18 +293,15 @@ struct ath5k_hw_5212_tx_desc {
 } __packed;
 
 /*
- * common hardware RX descriptor
+ * Common hardware RX descriptor
  */
 struct ath5k_hw_all_rx_desc {
-        struct ath5k_hw_rx_ctl                  rx_ctl;
-        union {
-                struct ath5k_hw_rx_status       rx_stat;
-                struct ath5k_hw_rx_error        rx_err;
-        } u;
+        struct ath5k_hw_rx_ctl          rx_ctl;
+        struct ath5k_hw_rx_status       rx_stat;
 } __packed;
 
 /*
- * Atheros hardware descriptor
+ * Atheros hardware DMA descriptor
  * This is read and written to by the hardware
  */
 struct ath5k_desc {
@@ -346,4 +323,3 @@ struct ath5k_desc {
 #define AR5K_TXDESC_CTSENA      0x0008
 #define AR5K_TXDESC_INTREQ      0x0010
 #define AR5K_TXDESC_VEOL        0x0020  /*[5211+]*/
-
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index dd112be218ab..973ae4f49f35 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -32,7 +32,8 @@ ath9k_hw-y:=	\
                 mac.o \
                 ar9002_mac.o \
                 ar9003_mac.o \
-                ar9003_eeprom.o
+                ar9003_eeprom.o \
+                ar9003_paprd.o
 
 obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 3da820ffc65e..cc648b6ae31c 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
+ * Copyright (c) 2008-2010 Atheros Communications 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
@@ -17,8 +17,99 @@
 #include "hw.h"
 #include "hw-ops.h"
 
-static int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
-                                        struct ath9k_channel *chan)
+struct ani_ofdm_level_entry {
+        int spur_immunity_level;
+        int fir_step_level;
+        int ofdm_weak_signal_on;
+};
+
+/* values here are relative to the INI */
+
+/*
+ * Legend:
+ *
+ * SI: Spur immunity
+ * FS: FIR Step
+ * WS: OFDM / CCK Weak Signal detection
+ * MRC-CCK: Maximal Ratio Combining for CCK
+ */
+
+static const struct ani_ofdm_level_entry ofdm_level_table[] = {
+        /* SI  FS  WS */
+        {  0,  0,  1  }, /* lvl 0 */
+        {  1,  1,  1  }, /* lvl 1 */
+        {  2,  2,  1  }, /* lvl 2 */
+        {  3,  2,  1  }, /* lvl 3  (default) */
+        {  4,  3,  1  }, /* lvl 4 */
+        {  5,  4,  1  }, /* lvl 5 */
+        {  6,  5,  1  }, /* lvl 6 */
+        {  7,  6,  1  }, /* lvl 7 */
+        {  7,  7,  1  }, /* lvl 8 */
+        {  7,  8,  0  }  /* lvl 9 */
+};
+#define ATH9K_ANI_OFDM_NUM_LEVEL \
+        (sizeof(ofdm_level_table)/sizeof(ofdm_level_table[0]))
+#define ATH9K_ANI_OFDM_MAX_LEVEL \
+        (ATH9K_ANI_OFDM_NUM_LEVEL-1)
+#define ATH9K_ANI_OFDM_DEF_LEVEL \
+        3 /* default level - matches the INI settings */
+
+/*
+ * MRC (Maximal Ratio Combining) has always been used with multi-antenna ofdm.
+ * With OFDM for single stream you just add up all antenna inputs, you're
+ * only interested in what you get after FFT. Signal aligment is also not
+ * required for OFDM because any phase difference adds up in the frequency
+ * domain.
+ *
+ * MRC requires extra work for use with CCK. You need to align the antenna
+ * signals from the different antenna before you can add the signals together.
+ * You need aligment of signals as CCK is in time domain, so addition can cancel
+ * your signal completely if phase is 180 degrees (think of adding sine waves).
+ * You also need to remove noise before the addition and this is where ANI
+ * MRC CCK comes into play. One of the antenna inputs may be stronger but
+ * lower SNR, so just adding after alignment can be dangerous.
+ *
+ * Regardless of alignment in time, the antenna signals add constructively after
+ * FFT and improve your reception. For more information:
+ *
+ * http://en.wikipedia.org/wiki/Maximal-ratio_combining
+ */
+
+struct ani_cck_level_entry {
+        int fir_step_level;
+        int mrc_cck_on;
+};
+
+static const struct ani_cck_level_entry cck_level_table[] = {
+        /* FS  MRC-CCK  */
+        {  0,  1  }, /* lvl 0 */
+        {  1,  1  }, /* lvl 1 */
+        {  2,  1  }, /* lvl 2  (default) */
+        {  3,  1  }, /* lvl 3 */
+        {  4,  0  }, /* lvl 4 */
+        {  5,  0  }, /* lvl 5 */
+        {  6,  0  }, /* lvl 6 */
+        {  7,  0  }, /* lvl 7 (only for high rssi) */
+        {  8,  0  }  /* lvl 8 (only for high rssi) */
+};
+
+#define ATH9K_ANI_CCK_NUM_LEVEL \
+        (sizeof(cck_level_table)/sizeof(cck_level_table[0]))
+#define ATH9K_ANI_CCK_MAX_LEVEL \
+        (ATH9K_ANI_CCK_NUM_LEVEL-1)
+#define ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI \
+        (ATH9K_ANI_CCK_NUM_LEVEL-3)
+#define ATH9K_ANI_CCK_DEF_LEVEL \
+        2 /* default level - matches the INI settings */
+
+/* Private to ani.c */
+static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
+{
+        ath9k_hw_private_ops(ah)->ani_lower_immunity(ah);
+}
+
+int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
+                                 struct ath9k_channel *chan)
 {
         int i;
 
@@ -48,7 +139,7 @@ static void ath9k_hw_update_mibstats(struct ath_hw *ah,
         stats->beacons += REG_READ(ah, AR_BEACON_CNT);
 }
 
-static void ath9k_ani_restart(struct ath_hw *ah)
+static void ath9k_ani_restart_old(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -96,7 +187,42 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState->cckPhyErrCount = 0;
 }
 
-static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
+static void ath9k_ani_restart_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+        aniState->listenTime = 0;
+
+        aniState->ofdmPhyErrBase = 0;
+        aniState->cckPhyErrBase = 0;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "Writing ofdmbase=%08x   cckbase=%08x\n",
+                  aniState->ofdmPhyErrBase,
+                  aniState->cckPhyErrBase);
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        REG_WRITE(ah, AR_PHY_ERR_1, aniState->ofdmPhyErrBase);
+        REG_WRITE(ah, AR_PHY_ERR_2, aniState->cckPhyErrBase);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+        DISABLE_REGWRITE_BUFFER(ah);
+
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        aniState->ofdmPhyErrCount = 0;
+        aniState->cckPhyErrCount = 0;
+}
+
+static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
         struct ar5416AniState *aniState;
@@ -168,7 +294,7 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
         }
 }
 
-static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
+static void ath9k_hw_ani_cck_err_trigger_old(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
         struct ar5416AniState *aniState;
@@ -206,7 +332,125 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
         }
 }
 
-static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
+/* Adjust the OFDM Noise Immunity Level */
+static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        const struct ani_ofdm_level_entry *entry_ofdm;
+        const struct ani_cck_level_entry *entry_cck;
+
+        aniState->noiseFloor = BEACON_RSSI(ah);
+
+        ath_print(common, ATH_DBG_ANI,
+                  "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
+                  aniState->ofdmNoiseImmunityLevel,
+                  immunityLevel, aniState->noiseFloor,
+                  aniState->rssiThrLow, aniState->rssiThrHigh);
+
+        aniState->ofdmNoiseImmunityLevel = immunityLevel;
+
+        entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+        entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+        if (aniState->spurImmunityLevel != entry_ofdm->spur_immunity_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
+                                     entry_ofdm->spur_immunity_level);
+
+        if (aniState->firstepLevel != entry_ofdm->fir_step_level &&
+            entry_ofdm->fir_step_level >= entry_cck->fir_step_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_FIRSTEP_LEVEL,
+                                     entry_ofdm->fir_step_level);
+
+        if ((ah->opmode != NL80211_IFTYPE_STATION &&
+             ah->opmode != NL80211_IFTYPE_ADHOC) ||
+            aniState->noiseFloor <= aniState->rssiThrHigh) {
+                if (aniState->ofdmWeakSigDetectOff)
+                        /* force on ofdm weak sig detect */
+                        ath9k_hw_ani_control(ah,
+                                ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+                                             true);
+                else if (aniState->ofdmWeakSigDetectOff ==
+                         entry_ofdm->ofdm_weak_signal_on)
+                        ath9k_hw_ani_control(ah,
+                                ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+                                entry_ofdm->ofdm_weak_signal_on);
+        }
+}
+
+static void ath9k_hw_ani_ofdm_err_trigger_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+
+        if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1);
+}
+
+/*
+ * Set the ANI settings to match an CCK level.
+ */
+static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        const struct ani_ofdm_level_entry *entry_ofdm;
+        const struct ani_cck_level_entry *entry_cck;
+
+        aniState->noiseFloor = BEACON_RSSI(ah);
+        ath_print(common, ATH_DBG_ANI,
+                  "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
+                  aniState->cckNoiseImmunityLevel, immunityLevel,
+                  aniState->noiseFloor, aniState->rssiThrLow,
+                  aniState->rssiThrHigh);
+
+        if ((ah->opmode == NL80211_IFTYPE_STATION ||
+             ah->opmode == NL80211_IFTYPE_ADHOC) &&
+            aniState->noiseFloor <= aniState->rssiThrLow &&
+            immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
+                immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
+
+        aniState->cckNoiseImmunityLevel = immunityLevel;
+
+        entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+        entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+        if (aniState->firstepLevel != entry_cck->fir_step_level &&
+            entry_cck->fir_step_level >= entry_ofdm->fir_step_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_FIRSTEP_LEVEL,
+                                     entry_cck->fir_step_level);
+
+        /* Skip MRC CCK for pre AR9003 families */
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                return;
+
+        if (aniState->mrcCCKOff == entry_cck->mrc_cck_on)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_MRC_CCK,
+                                     entry_cck->mrc_cck_on);
+}
+
+static void ath9k_hw_ani_cck_err_trigger_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+
+        if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1);
+}
+
+static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
         int32_t rssi;
@@ -259,9 +503,53 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
         }
 }
 
+/*
+ * only lower either OFDM or CCK errors per turn
+ * we lower the other one next time
+ */
+static void ath9k_hw_ani_lower_immunity_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        aniState = ah->curani;
+
+        /* lower OFDM noise immunity */
+        if (aniState->ofdmNoiseImmunityLevel > 0 &&
+            (aniState->ofdmsTurn || aniState->cckNoiseImmunityLevel == 0)) {
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1);
+                return;
+        }
+
+        /* lower CCK noise immunity */
+        if (aniState->cckNoiseImmunityLevel > 0)
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1);
+}
+
+static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah)
+{
+        struct ath9k_channel *chan = ah->curchan;
+        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
+        u8 clockrate; /* in MHz */
+
+        if (!ah->curchan) /* should really check for CCK instead */
+                clockrate = ATH9K_CLOCK_RATE_CCK;
+        else if (conf->channel->band == IEEE80211_BAND_2GHZ)
+                clockrate = ATH9K_CLOCK_RATE_2GHZ_OFDM;
+        else if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+                clockrate = ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM;
+        else
+                clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;
+
+        if (conf_is_ht40(conf))
+                return clockrate * 2;
+
+        return clockrate * 2;
+}
+
 static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
         u32 txFrameCount, rxFrameCount, cycleCount;
         int32_t listenTime;
 
@@ -271,15 +559,31 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
 
         aniState = ah->curani;
         if (aniState->cycleCount == 0 || aniState->cycleCount > cycleCount) {
-
                 listenTime = 0;
                 ah->stats.ast_ani_lzero++;
+                ath_print(common, ATH_DBG_ANI,
+                          "1st call: aniState->cycleCount=%d\n",
+                          aniState->cycleCount);
         } else {
                 int32_t ccdelta = cycleCount - aniState->cycleCount;
                 int32_t rfdelta = rxFrameCount - aniState->rxFrameCount;
                 int32_t tfdelta = txFrameCount - aniState->txFrameCount;
-                listenTime = (ccdelta - rfdelta - tfdelta) / 44000;
+                int32_t clock_rate;
+
+                /*
+                 * convert HW counter values to ms using mode
+                 * specifix clock rate
+                 */
+                clock_rate = ath9k_hw_chan_2_clockrate_mhz(ah) * 1000;;
+
+                listenTime = (ccdelta - rfdelta - tfdelta) / clock_rate;
+
+                ath_print(common, ATH_DBG_ANI,
+                          "cyclecount=%d, rfcount=%d, "
+                          "tfcount=%d, listenTime=%d CLOCK_RATE=%d\n",
+                          ccdelta, rfdelta, tfdelta, listenTime, clock_rate);
         }
+
         aniState->cycleCount = cycleCount;
         aniState->txFrameCount = txFrameCount;
         aniState->rxFrameCount = rxFrameCount;
@@ -287,7 +591,7 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
         return listenTime;
 }
 
-void ath9k_ani_reset(struct ath_hw *ah)
+static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
 {
         struct ar5416AniState *aniState;
         struct ath9k_channel *chan = ah->curchan;
@@ -340,7 +644,7 @@ void ath9k_ani_reset(struct ath_hw *ah)
                         ah->curani->cckTrigLow =
                                 ah->config.cck_trig_low;
                 }
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
                 return;
         }
 
@@ -362,7 +666,7 @@ void ath9k_ani_reset(struct ath_hw *ah)
 
         ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
                              ~ATH9K_RX_FILTER_PHYERR);
-        ath9k_ani_restart(ah);
+        ath9k_ani_restart_old(ah);
 
         ENABLE_REGWRITE_BUFFER(ah);
 
@@ -373,8 +677,102 @@ void ath9k_ani_reset(struct ath_hw *ah)
         DISABLE_REGWRITE_BUFFER(ah);
 }
 
-void ath9k_hw_ani_monitor(struct ath_hw *ah,
-                          struct ath9k_channel *chan)
+/*
+ * Restore the ANI parameters in the HAL and reset the statistics.
+ * This routine should be called for every hardware reset and for
+ * every channel change.
+ */
+static void ath9k_ani_reset_new(struct ath_hw *ah, bool is_scanning)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if (!DO_ANI(ah))
+                return;
+
+        BUG_ON(aniState == NULL);
+        ah->stats.ast_ani_reset++;
+
+        /* only allow a subset of functions in AP mode */
+        if (ah->opmode == NL80211_IFTYPE_AP) {
+                if (IS_CHAN_2GHZ(chan)) {
+                        ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
+                                            ATH9K_ANI_FIRSTEP_LEVEL);
+                        if (AR_SREV_9300_20_OR_LATER(ah))
+                                ah->ani_function |= ATH9K_ANI_MRC_CCK;
+                } else
+                        ah->ani_function = 0;
+        }
+
+        /* always allow mode (on/off) to be controlled */
+        ah->ani_function |= ATH9K_ANI_MODE;
+
+        if (is_scanning ||
+            (ah->opmode != NL80211_IFTYPE_STATION &&
+             ah->opmode != NL80211_IFTYPE_ADHOC)) {
+                /*
+                 * If we're scanning or in AP mode, the defaults (ini)
+                 * should be in place. For an AP we assume the historical
+                 * levels for this channel are probably outdated so start
+                 * from defaults instead.
+                 */
+                if (aniState->ofdmNoiseImmunityLevel !=
+                    ATH9K_ANI_OFDM_DEF_LEVEL ||
+                    aniState->cckNoiseImmunityLevel !=
+                    ATH9K_ANI_CCK_DEF_LEVEL) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "Restore defaults: opmode %u "
+                                  "chan %d Mhz/0x%x is_scanning=%d "
+                                  "ofdm:%d cck:%d\n",
+                                  ah->opmode,
+                                  chan->channel,
+                                  chan->channelFlags,
+                                  is_scanning,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  aniState->cckNoiseImmunityLevel);
+
+                        ath9k_hw_set_ofdm_nil(ah, ATH9K_ANI_OFDM_DEF_LEVEL);
+                        ath9k_hw_set_cck_nil(ah, ATH9K_ANI_CCK_DEF_LEVEL);
+                }
+        } else {
+                /*
+                 * restore historical levels for this channel
+                 */
+                ath_print(common, ATH_DBG_ANI,
+                          "Restore history: opmode %u "
+                          "chan %d Mhz/0x%x is_scanning=%d "
+                          "ofdm:%d cck:%d\n",
+                          ah->opmode,
+                          chan->channel,
+                          chan->channelFlags,
+                          is_scanning,
+                          aniState->ofdmNoiseImmunityLevel,
+                          aniState->cckNoiseImmunityLevel);
+
+                        ath9k_hw_set_ofdm_nil(ah,
+                                              aniState->ofdmNoiseImmunityLevel);
+                        ath9k_hw_set_cck_nil(ah,
+                                             aniState->cckNoiseImmunityLevel);
+        }
+
+        /*
+         * enable phy counters if hw supports or if not, enable phy
+         * interrupts (so we can count each one)
+         */
+        ath9k_ani_restart_new(ah);
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+        DISABLE_REGWRITE_BUFFER(ah);
+}
+
+static void ath9k_hw_ani_monitor_old(struct ath_hw *ah,
+                                     struct ath9k_channel *chan)
 {
         struct ar5416AniState *aniState;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -390,7 +788,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah,
         listenTime = ath9k_hw_ani_get_listen_time(ah);
         if (listenTime < 0) {
                 ah->stats.ast_ani_lneg++;
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
                 return;
         }
 
@@ -444,21 +842,166 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah,
                     aniState->cckPhyErrCount <= aniState->listenTime *
                     aniState->cckTrigLow / 1000)
                         ath9k_hw_ani_lower_immunity(ah);
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
         } else if (aniState->listenTime > ah->aniperiod) {
                 if (aniState->ofdmPhyErrCount > aniState->listenTime *
                     aniState->ofdmTrigHigh / 1000) {
-                        ath9k_hw_ani_ofdm_err_trigger(ah);
-                        ath9k_ani_restart(ah);
+                        ath9k_hw_ani_ofdm_err_trigger_old(ah);
+                        ath9k_ani_restart_old(ah);
                 } else if (aniState->cckPhyErrCount >
                            aniState->listenTime * aniState->cckTrigHigh /
                            1000) {
-                        ath9k_hw_ani_cck_err_trigger(ah);
-                        ath9k_ani_restart(ah);
+                        ath9k_hw_ani_cck_err_trigger_old(ah);
+                        ath9k_ani_restart_old(ah);
+                }
+        }
+}
+
+static void ath9k_hw_ani_monitor_new(struct ath_hw *ah,
+                                     struct ath9k_channel *chan)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int32_t listenTime;
+        u32 phyCnt1, phyCnt2;
+        u32 ofdmPhyErrCnt, cckPhyErrCnt;
+        u32 ofdmPhyErrRate, cckPhyErrRate;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+        if (WARN_ON(!aniState))
+                return;
+
+        listenTime = ath9k_hw_ani_get_listen_time(ah);
+        if (listenTime <= 0) {
+                ah->stats.ast_ani_lneg++;
+                /* restart ANI period if listenTime is invalid */
+                ath_print(common, ATH_DBG_ANI,
+                          "listenTime=%d - on new ani monitor\n",
+                          listenTime);
+                ath9k_ani_restart_new(ah);
+                return;
+        }
+
+        aniState->listenTime += listenTime;
+
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
+        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+
+        if (phyCnt1 < aniState->ofdmPhyErrBase ||
+            phyCnt2 < aniState->cckPhyErrBase) {
+                if (phyCnt1 < aniState->ofdmPhyErrBase) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "phyCnt1 0x%x, resetting "
+                                  "counter value to 0x%x\n",
+                                  phyCnt1,
+                                  aniState->ofdmPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_1,
+                                  aniState->ofdmPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_MASK_1,
+                                  AR_PHY_ERR_OFDM_TIMING);
+                }
+                if (phyCnt2 < aniState->cckPhyErrBase) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "phyCnt2 0x%x, resetting "
+                                  "counter value to 0x%x\n",
+                                  phyCnt2,
+                                  aniState->cckPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_2,
+                                  aniState->cckPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_MASK_2,
+                                  AR_PHY_ERR_CCK_TIMING);
+                }
+                return;
+        }
+
+        ofdmPhyErrCnt = phyCnt1 - aniState->ofdmPhyErrBase;
+        ah->stats.ast_ani_ofdmerrs +=
+                ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
+        aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
+
+        cckPhyErrCnt = phyCnt2 - aniState->cckPhyErrBase;
+        ah->stats.ast_ani_cckerrs +=
+                cckPhyErrCnt - aniState->cckPhyErrCount;
+        aniState->cckPhyErrCount = cckPhyErrCnt;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "Errors: OFDM=0x%08x-0x%08x=%d   "
+                  "CCK=0x%08x-0x%08x=%d\n",
+                  phyCnt1,
+                  aniState->ofdmPhyErrBase,
+                  ofdmPhyErrCnt,
+                  phyCnt2,
+                  aniState->cckPhyErrBase,
+                  cckPhyErrCnt);
+
+        ofdmPhyErrRate = aniState->ofdmPhyErrCount * 1000 /
+                         aniState->listenTime;
+        cckPhyErrRate =  aniState->cckPhyErrCount * 1000 /
+                         aniState->listenTime;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "listenTime=%d OFDM:%d errs=%d/s CCK:%d "
+                  "errs=%d/s ofdm_turn=%d\n",
+                  listenTime, aniState->ofdmNoiseImmunityLevel,
+                  ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,
+                  cckPhyErrRate, aniState->ofdmsTurn);
+
+        if (aniState->listenTime > 5 * ah->aniperiod) {
+                if (ofdmPhyErrRate <= aniState->ofdmTrigLow &&
+                    cckPhyErrRate <= aniState->cckTrigLow) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "1. listenTime=%d OFDM:%d errs=%d/s(<%d)  "
+                                  "CCK:%d errs=%d/s(<%d) -> "
+                                  "ath9k_hw_ani_lower_immunity()\n",
+                                  aniState->listenTime,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  ofdmPhyErrRate,
+                                  aniState->ofdmTrigLow,
+                                  aniState->cckNoiseImmunityLevel,
+                                  cckPhyErrRate,
+                                  aniState->cckTrigLow);
+                        ath9k_hw_ani_lower_immunity(ah);
+                        aniState->ofdmsTurn = !aniState->ofdmsTurn;
+                }
+                ath_print(common, ATH_DBG_ANI,
+                          "1 listenTime=%d ofdm=%d/s cck=%d/s - "
+                          "calling ath9k_ani_restart_new()\n",
+                          aniState->listenTime, ofdmPhyErrRate, cckPhyErrRate);
+                ath9k_ani_restart_new(ah);
+        } else if (aniState->listenTime > ah->aniperiod) {
+                /* check to see if need to raise immunity */
+                if (ofdmPhyErrRate > aniState->ofdmTrigHigh &&
+                    (cckPhyErrRate <= aniState->cckTrigHigh ||
+                     aniState->ofdmsTurn)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "2 listenTime=%d OFDM:%d errs=%d/s(>%d) -> "
+                                  "ath9k_hw_ani_ofdm_err_trigger_new()\n",
+                                  aniState->listenTime,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  ofdmPhyErrRate,
+                                  aniState->ofdmTrigHigh);
+                        ath9k_hw_ani_ofdm_err_trigger_new(ah);
+                        ath9k_ani_restart_new(ah);
+                        aniState->ofdmsTurn = false;
+                } else if (cckPhyErrRate > aniState->cckTrigHigh) {
+                        ath_print(common, ATH_DBG_ANI,
+                                 "3 listenTime=%d CCK:%d errs=%d/s(>%d) -> "
+                                 "ath9k_hw_ani_cck_err_trigger_new()\n",
+                                 aniState->listenTime,
+                                 aniState->cckNoiseImmunityLevel,
+                                 cckPhyErrRate,
+                                 aniState->cckTrigHigh);
+                        ath9k_hw_ani_cck_err_trigger_new(ah);
+                        ath9k_ani_restart_new(ah);
+                        aniState->ofdmsTurn = true;
                 }
         }
 }
-EXPORT_SYMBOL(ath9k_hw_ani_monitor);
 
 void ath9k_enable_mib_counters(struct ath_hw *ah)
 {
@@ -543,7 +1086,7 @@ u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah,
  * any of the MIB counters overflow/trigger so don't assume we're
  * here because a PHY error counter triggered.
  */
-void ath9k_hw_procmibevent(struct ath_hw *ah)
+static void ath9k_hw_proc_mib_event_old(struct ath_hw *ah)
 {
         u32 phyCnt1, phyCnt2;
 
@@ -556,8 +1099,15 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
         /* Clear the mib counters and save them in the stats */
         ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
-        if (!DO_ANI(ah))
+        if (!DO_ANI(ah)) {
+                /*
+                 * We must always clear the interrupt cause by
+                 * resetting the phy error regs.
+                 */
+                REG_WRITE(ah, AR_PHY_ERR_1, 0);
+                REG_WRITE(ah, AR_PHY_ERR_2, 0);
                 return;
+        }
 
         /* NB: these are not reset-on-read */
         phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
@@ -585,14 +1135,51 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
                  * check will never be true.
                  */
                 if (aniState->ofdmPhyErrCount > aniState->ofdmTrigHigh)
-                        ath9k_hw_ani_ofdm_err_trigger(ah);
+                        ath9k_hw_ani_ofdm_err_trigger_new(ah);
                 if (aniState->cckPhyErrCount > aniState->cckTrigHigh)
-                        ath9k_hw_ani_cck_err_trigger(ah);
+                        ath9k_hw_ani_cck_err_trigger_old(ah);
                 /* NB: always restart to insure the h/w counters are reset */
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
         }
 }
-EXPORT_SYMBOL(ath9k_hw_procmibevent);
+
+/*
+ * Process a MIB interrupt.  We may potentially be invoked because
+ * any of the MIB counters overflow/trigger so don't assume we're
+ * here because a PHY error counter triggered.
+ */
+static void ath9k_hw_proc_mib_event_new(struct ath_hw *ah)
+{
+        u32 phyCnt1, phyCnt2;
+
+        /* Reset these counters regardless */
+        REG_WRITE(ah, AR_FILT_OFDM, 0);
+        REG_WRITE(ah, AR_FILT_CCK, 0);
+        if (!(REG_READ(ah, AR_SLP_MIB_CTRL) & AR_SLP_MIB_PENDING))
+                REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);
+
+        /* Clear the mib counters and save them in the stats */
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        if (!DO_ANI(ah)) {
+                /*
+                 * We must always clear the interrupt cause by
+                 * resetting the phy error regs.
+                 */
+                REG_WRITE(ah, AR_PHY_ERR_1, 0);
+                REG_WRITE(ah, AR_PHY_ERR_2, 0);
+                return;
+        }
+
+        /* NB: these are not reset-on-read */
+        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
+        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+
+        /* NB: always restart to insure the h/w counters are reset */
+        if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
+            ((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK))
+                ath9k_ani_restart_new(ah);
+}
 
 void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
@@ -620,22 +1207,70 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         memset(ah->ani, 0, sizeof(ah->ani));
         for (i = 0; i < ARRAY_SIZE(ah->ani); i++) {
-                ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH;
-                ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW;
-                ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH;
-                ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW;
+                if (AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani) {
+                        ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH_NEW;
+                        ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW_NEW;
+
+                        ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH_NEW;
+                        ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW_NEW;
+
+                        ah->ani[i].spurImmunityLevel =
+                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+
+                        ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+
+                        ah->ani[i].ofdmPhyErrBase = 0;
+                        ah->ani[i].cckPhyErrBase = 0;
+
+                        if (AR_SREV_9300_20_OR_LATER(ah))
+                                ah->ani[i].mrcCCKOff =
+                                        !ATH9K_ANI_ENABLE_MRC_CCK;
+                        else
+                                ah->ani[i].mrcCCKOff = true;
+
+                        ah->ani[i].ofdmsTurn = true;
+                } else {
+                        ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
+                        ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
+
+                        ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
+                        ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW_OLD;
+
+                        ah->ani[i].spurImmunityLevel =
+                                ATH9K_ANI_SPUR_IMMUNE_LVL_OLD;
+                        ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL_OLD;
+
+                        ah->ani[i].ofdmPhyErrBase =
+                                AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
+                        ah->ani[i].cckPhyErrBase =
+                                AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH_OLD;
+                        ah->ani[i].cckWeakSigThreshold =
+                                ATH9K_ANI_CCK_WEAK_SIG_THR;
+                }
+
                 ah->ani[i].rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
                 ah->ani[i].rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
                 ah->ani[i].ofdmWeakSigDetectOff =
                         !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-                ah->ani[i].cckWeakSigThreshold =
-                        ATH9K_ANI_CCK_WEAK_SIG_THR;
-                ah->ani[i].spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
-                ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
-                ah->ani[i].ofdmPhyErrBase =
-                        AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH;
-                ah->ani[i].cckPhyErrBase =
-                        AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH;
+                ah->ani[i].cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
+        }
+
+        /*
+         * since we expect some ongoing maintenance on the tables, let's sanity
+         * check here default level should not modify INI setting.
+         */
+        if (AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani) {
+                const struct ani_ofdm_level_entry *entry_ofdm;
+                const struct ani_cck_level_entry *entry_cck;
+
+                entry_ofdm = &ofdm_level_table[ATH9K_ANI_OFDM_DEF_LEVEL];
+                entry_cck = &cck_level_table[ATH9K_ANI_CCK_DEF_LEVEL];
+
+                ah->aniperiod = ATH9K_ANI_PERIOD_NEW;
+                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_NEW;
+        } else {
+                ah->aniperiod = ATH9K_ANI_PERIOD_OLD;
+                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_OLD;
         }
 
         ath_print(common, ATH_DBG_ANI,
@@ -654,7 +1289,34 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         ath9k_enable_mib_counters(ah);
 
-        ah->aniperiod = ATH9K_ANI_PERIOD;
         if (ah->config.enable_ani)
                 ah->proc_phyerr |= HAL_PROCESS_ANI;
 }
+
+void ath9k_hw_attach_ani_ops_old(struct ath_hw *ah)
+{
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+
+        priv_ops->ani_reset = ath9k_ani_reset_old;
+        priv_ops->ani_lower_immunity = ath9k_hw_ani_lower_immunity_old;
+
+        ops->ani_proc_mib_event = ath9k_hw_proc_mib_event_old;
+        ops->ani_monitor = ath9k_hw_ani_monitor_old;
+
+        ath_print(ath9k_hw_common(ah), ATH_DBG_ANY, "Using ANI v1\n");
+}
+
+void ath9k_hw_attach_ani_ops_new(struct ath_hw *ah)
+{
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+
+        priv_ops->ani_reset = ath9k_ani_reset_new;
+        priv_ops->ani_lower_immunity = ath9k_hw_ani_lower_immunity_new;
+
+        ops->ani_proc_mib_event = ath9k_hw_proc_mib_event_new;
+        ops->ani_monitor = ath9k_hw_ani_monitor_new;
+
+        ath_print(ath9k_hw_common(ah), ATH_DBG_ANY, "Using ANI v2\n");
+}
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 3356762ea384..f4d0a4d48b37 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -23,23 +23,55 @@
 
 #define BEACON_RSSI(ahp) (ahp->stats.avgbrssi)
 
-#define ATH9K_ANI_OFDM_TRIG_HIGH          500
-#define ATH9K_ANI_OFDM_TRIG_LOW           200
-#define ATH9K_ANI_CCK_TRIG_HIGH           200
-#define ATH9K_ANI_CCK_TRIG_LOW            100
+/* units are errors per second */
+#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
+#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      1000
+
+/* units are errors per second */
+#define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
+#define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
+
+/* units are errors per second */
+#define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
+#define ATH9K_ANI_CCK_TRIG_HIGH_NEW       600
+
+/* units are errors per second */
+#define ATH9K_ANI_CCK_TRIG_LOW_OLD        100
+#define ATH9K_ANI_CCK_TRIG_LOW_NEW        300
+
 #define ATH9K_ANI_NOISE_IMMUNE_LVL        4
 #define ATH9K_ANI_USE_OFDM_WEAK_SIG       true
 #define ATH9K_ANI_CCK_WEAK_SIG_THR        false
-#define ATH9K_ANI_SPUR_IMMUNE_LVL         7
-#define ATH9K_ANI_FIRSTEP_LVL             0
+
+#define ATH9K_ANI_SPUR_IMMUNE_LVL_OLD     7
+#define ATH9K_ANI_SPUR_IMMUNE_LVL_NEW     3
+
+#define ATH9K_ANI_FIRSTEP_LVL_OLD         0
+#define ATH9K_ANI_FIRSTEP_LVL_NEW         2
+
 #define ATH9K_ANI_RSSI_THR_HIGH           40
 #define ATH9K_ANI_RSSI_THR_LOW            7
-#define ATH9K_ANI_PERIOD                  100
+
+#define ATH9K_ANI_PERIOD_OLD              100
+#define ATH9K_ANI_PERIOD_NEW              1000
+
+/* in ms */
+#define ATH9K_ANI_POLLINTERVAL_OLD        100
+#define ATH9K_ANI_POLLINTERVAL_NEW        1000
 
 #define HAL_NOISE_IMMUNE_MAX              4
 #define HAL_SPUR_IMMUNE_MAX               7
 #define HAL_FIRST_STEP_MAX                2
 
+#define ATH9K_SIG_FIRSTEP_SETTING_MIN     0
+#define ATH9K_SIG_FIRSTEP_SETTING_MAX     20
+#define ATH9K_SIG_SPUR_IMM_SETTING_MIN    0
+#define ATH9K_SIG_SPUR_IMM_SETTING_MAX    22
+
+#define ATH9K_ANI_ENABLE_MRC_CCK          true
+
+/* values here are relative to the INI */
+
 enum ath9k_ani_cmd {
         ATH9K_ANI_PRESENT = 0x1,
         ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,
@@ -49,7 +81,8 @@ enum ath9k_ani_cmd {
         ATH9K_ANI_SPUR_IMMUNITY_LEVEL = 0x20,
         ATH9K_ANI_MODE = 0x40,
         ATH9K_ANI_PHYERR_RESET = 0x80,
-        ATH9K_ANI_ALL = 0xff
+        ATH9K_ANI_MRC_CCK = 0x100,
+        ATH9K_ANI_ALL = 0xfff
 };
 
 struct ath9k_mib_stats {
@@ -60,9 +93,31 @@ struct ath9k_mib_stats {
         u32 beacons;
 };
 
+/* INI default values for ANI registers */
+struct ath9k_ani_default {
+        u16 m1ThreshLow;
+        u16 m2ThreshLow;
+        u16 m1Thresh;
+        u16 m2Thresh;
+        u16 m2CountThr;
+        u16 m2CountThrLow;
+        u16 m1ThreshLowExt;
+        u16 m2ThreshLowExt;
+        u16 m1ThreshExt;
+        u16 m2ThreshExt;
+        u16 firstep;
+        u16 firstepLow;
+        u16 cycpwrThr1;
+        u16 cycpwrThr1Ext;
+};
+
 struct ar5416AniState {
         struct ath9k_channel *c;
         u8 noiseImmunityLevel;
+        u8 ofdmNoiseImmunityLevel;
+        u8 cckNoiseImmunityLevel;
+        bool ofdmsTurn;
+        u8 mrcCCKOff;
         u8 spurImmunityLevel;
         u8 firstepLevel;
         u8 ofdmWeakSigDetectOff;
@@ -85,6 +140,7 @@ struct ar5416AniState {
         int16_t pktRssi[2];
         int16_t ofdmErrRssi[2];
         int16_t cckErrRssi[2];
+        struct ath9k_ani_default iniDef;
 };
 
 struct ar5416Stats {
@@ -108,15 +164,13 @@ struct ar5416Stats {
 };
 #define ah_mibStats stats.ast_mibstats
 
-void ath9k_ani_reset(struct ath_hw *ah);
-void ath9k_hw_ani_monitor(struct ath_hw *ah,
-                          struct ath9k_channel *chan);
 void ath9k_enable_mib_counters(struct ath_hw *ah);
 void ath9k_hw_disable_mib_counters(struct ath_hw *ah);
 u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah, u32 *rxc_pcnt,
                                   u32 *rxf_pcnt, u32 *txf_pcnt);
-void ath9k_hw_procmibevent(struct ath_hw *ah);
 void ath9k_hw_ani_setup(struct ath_hw *ah);
 void ath9k_hw_ani_init(struct ath_hw *ah);
+int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
+                                 struct ath9k_channel *chan);
 
 #endif /* ANI_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 96018d53f48e..ee34a495b0be 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -19,7 +19,30 @@
 #include "../regd.h"
 #include "ar9002_phy.h"
 
-/* All code below is for non single-chip solutions */
+/* All code below is for AR5008, AR9001, AR9002 */
+
+static const int firstep_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -4, -2,  0,  2,  4,  6,  8, 10, 12 }; /* lvl 0-8, default 2 */
+
+static const int cycpwrThr1_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -6, -4, -2,  0,  2,  4,  6,  8 };     /* lvl 0-7, default 3 */
+
+/*
+ * register values to turn OFDM weak signal detection OFF
+ */
+static const int m1ThreshLow_off = 127;
+static const int m2ThreshLow_off = 127;
+static const int m1Thresh_off = 127;
+static const int m2Thresh_off = 127;
+static const int m2CountThr_off =  31;
+static const int m2CountThrLow_off =  63;
+static const int m1ThreshLowExt_off = 127;
+static const int m2ThreshLowExt_off = 127;
+static const int m1ThreshExt_off = 127;
+static const int m2ThreshExt_off = 127;
+
 
 /**
  * ar5008_hw_phy_modify_rx_buffer() - perform analog swizzling of parameters
@@ -1026,8 +1049,9 @@ static u32 ar5008_hw_compute_pll_control(struct ath_hw *ah,
         return pll;
 }
 
-static bool ar5008_hw_ani_control(struct ath_hw *ah,
-                                  enum ath9k_ani_cmd cmd, int param)
+static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
+                                      enum ath9k_ani_cmd cmd,
+                                      int param)
 {
         struct ar5416AniState *aniState = ah->curani;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -1209,6 +1233,265 @@ static bool ar5008_hw_ani_control(struct ath_hw *ah,
         return true;
 }
 
+static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
+                                      enum ath9k_ani_cmd cmd,
+                                      int param)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        s32 value, value2;
+
+        switch (cmd & ah->ani_function) {
+        case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
+                /*
+                 * on == 1 means ofdm weak signal detection is ON
+                 * on == 1 is the default, for less noise immunity
+                 *
+                 * on == 0 means ofdm weak signal detection is OFF
+                 * on == 0 means more noise imm
+                 */
+                u32 on = param ? 1 : 0;
+                /*
+                 * make register setting for default
+                 * (weak sig detect ON) come from INI file
+                 */
+                int m1ThreshLow = on ?
+                        aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+                int m2ThreshLow = on ?
+                        aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+                int m1Thresh = on ?
+                        aniState->iniDef.m1Thresh : m1Thresh_off;
+                int m2Thresh = on ?
+                        aniState->iniDef.m2Thresh : m2Thresh_off;
+                int m2CountThr = on ?
+                        aniState->iniDef.m2CountThr : m2CountThr_off;
+                int m2CountThrLow = on ?
+                        aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+                int m1ThreshLowExt = on ?
+                        aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+                int m2ThreshLowExt = on ?
+                        aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+                int m1ThreshExt = on ?
+                        aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+                int m2ThreshExt = on ?
+                        aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
+
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+                              m1ThreshLow);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+                              m2ThreshLow);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M1_THRESH, m1Thresh);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M2_THRESH, m2Thresh);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+                              m2CountThrLow);
+
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
+
+                if (on)
+                        REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+                else
+                        REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+
+                if (!on != aniState->ofdmWeakSigDetectOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: ofdm weak signal: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->ofdmWeakSigDetectOff ?
+                                        "on" : "off",
+                                  on ? "on" : "off");
+                        if (on)
+                                ah->stats.ast_ani_ofdmon++;
+                        else
+                                ah->stats.ast_ani_ofdmoff++;
+                        aniState->ofdmWeakSigDetectOff = !on;
+                }
+                break;
+        }
+        case ATH9K_ANI_FIRSTEP_LEVEL:{
+                u32 level = param;
+
+                if (level >= ARRAY_SIZE(firstep_table)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "ATH9K_ANI_FIRSTEP_LEVEL: level "
+                                  "out of range (%u > %u)\n",
+                                  level,
+                                  (unsigned) ARRAY_SIZE(firstep_table));
+                        return false;
+                }
+
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = firstep_table[level] -
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        aniState->iniDef.firstep;
+                if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
+                              AR_PHY_FIND_SIG_FIRSTEP,
+                              value);
+                /*
+                 * we need to set first step low register too
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = firstep_table[level] -
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         aniState->iniDef.firstepLow;
+                if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value2 > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
+                              AR_PHY_FIND_SIG_FIRSTEP_LOW, value2);
+
+                if (level != aniState->firstepLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.firstep);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep_low[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.firstepLow);
+                        if (level > aniState->firstepLevel)
+                                ah->stats.ast_ani_stepup++;
+                        else if (level < aniState->firstepLevel)
+                                ah->stats.ast_ani_stepdown++;
+                        aniState->firstepLevel = level;
+                }
+                break;
+        }
+        case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
+                u32 level = param;
+
+                if (level >= ARRAY_SIZE(cycpwrThr1_table)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level "
+                                  "out of range (%u > %u)\n",
+                                  level,
+                                  (unsigned) ARRAY_SIZE(cycpwrThr1_table));
+                        return false;
+                }
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = cycpwrThr1_table[level] -
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        aniState->iniDef.cycpwrThr1;
+                if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_TIMING5,
+                              AR_PHY_TIMING5_CYCPWR_THR1,
+                              value);
+
+                /*
+                 * set AR_PHY_EXT_CCA for extension channel
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = cycpwrThr1_table[level] -
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         aniState->iniDef.cycpwrThr1Ext;
+                if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value2 > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
+                              AR_PHY_EXT_TIMING5_CYCPWR_THR1, value2);
+
+                if (level != aniState->spurImmunityLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.cycpwrThr1);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1Ext[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.cycpwrThr1Ext);
+                        if (level > aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurup++;
+                        else if (level < aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurdown++;
+                        aniState->spurImmunityLevel = level;
+                }
+                break;
+        }
+        case ATH9K_ANI_MRC_CCK:
+                /*
+                 * You should not see this as AR5008, AR9001, AR9002
+                 * does not have hardware support for MRC CCK.
+                 */
+                WARN_ON(1);
+                break;
+        case ATH9K_ANI_PRESENT:
+                break;
+        default:
+                ath_print(common, ATH_DBG_ANI,
+                          "invalid cmd %u\n", cmd);
+                return false;
+        }
+
+        ath_print(common, ATH_DBG_ANI,
+                  "ANI parameters: SI=%d, ofdmWS=%s FS=%d "
+                  "MRCcck=%s listenTime=%d CC=%d listen=%d "
+                  "ofdmErrs=%d cckErrs=%d\n",
+                  aniState->spurImmunityLevel,
+                  !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                  aniState->firstepLevel,
+                  !aniState->mrcCCKOff ? "on" : "off",
+                  aniState->listenTime,
+                  aniState->cycleCount,
+                  aniState->listenTime,
+                  aniState->ofdmPhyErrCount,
+                  aniState->cckPhyErrCount);
+        return true;
+}
+
 static void ar5008_hw_do_getnf(struct ath_hw *ah,
                               int16_t nfarray[NUM_NF_READINGS])
 {
@@ -1329,6 +1612,71 @@ static void ar5008_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
         DISABLE_REGWRITE_BUFFER(ah);
 }
 
+/*
+ * Initialize the ANI register values with default (ini) values.
+ * This routine is called during a (full) hardware reset after
+ * all the registers are initialised from the INI.
+ */
+static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath9k_ani_default *iniDef;
+        int index;
+        u32 val;
+
+        index = ath9k_hw_get_ani_channel_idx(ah, chan);
+        aniState = &ah->ani[index];
+        ah->curani = aniState;
+        iniDef = &aniState->iniDef;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
+                  ah->hw_version.macVersion,
+                  ah->hw_version.macRev,
+                  ah->opmode,
+                  chan->channel,
+                  chan->channelFlags);
+
+        val = REG_READ(ah, AR_PHY_SFCORR);
+        iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
+        iniDef->m2Thresh = MS(val, AR_PHY_SFCORR_M2_THRESH);
+        iniDef->m2CountThr = MS(val, AR_PHY_SFCORR_M2COUNT_THR);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_LOW);
+        iniDef->m1ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M1_THRESH_LOW);
+        iniDef->m2ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M2_THRESH_LOW);
+        iniDef->m2CountThrLow = MS(val, AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_EXT);
+        iniDef->m1ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH);
+        iniDef->m2ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH);
+        iniDef->m1ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH_LOW);
+        iniDef->m2ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH_LOW);
+        iniDef->firstep = REG_READ_FIELD(ah,
+                                         AR_PHY_FIND_SIG,
+                                         AR_PHY_FIND_SIG_FIRSTEP);
+        iniDef->firstepLow = REG_READ_FIELD(ah,
+                                            AR_PHY_FIND_SIG_LOW,
+                                            AR_PHY_FIND_SIG_FIRSTEP_LOW);
+        iniDef->cycpwrThr1 = REG_READ_FIELD(ah,
+                                            AR_PHY_TIMING5,
+                                            AR_PHY_TIMING5_CYCPWR_THR1);
+        iniDef->cycpwrThr1Ext = REG_READ_FIELD(ah,
+                                               AR_PHY_EXT_CCA,
+                                               AR_PHY_EXT_TIMING5_CYCPWR_THR1);
+
+        /* these levels just got reset to defaults by the INI */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCKOff = true; /* not available on pre AR9003 */
+
+        aniState->cycleCount = 0;
+}
+
+
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -1350,10 +1698,15 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->enable_rfkill = ar5008_hw_enable_rfkill;
         priv_ops->restore_chainmask = ar5008_restore_chainmask;
         priv_ops->set_diversity = ar5008_set_diversity;
-        priv_ops->ani_control = ar5008_hw_ani_control;
         priv_ops->do_getnf = ar5008_hw_do_getnf;
         priv_ops->loadnf = ar5008_hw_loadnf;
 
+        if (modparam_force_new_ani) {
+                priv_ops->ani_control = ar5008_hw_ani_control_new;
+                priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
+        } else
+                priv_ops->ani_control = ar5008_hw_ani_control_old;
+
         if (AR_SREV_9100(ah))
                 priv_ops->compute_pll_control = ar9100_hw_compute_pll_control;
         else if (AR_SREV_9160_10_OR_LATER(ah))
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 7ba9dd68cc05..0317ac9fc1b7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -20,6 +20,10 @@
 #include "ar9002_initvals.h"
 #include "ar9002_phy.h"
 
+int modparam_force_new_ani;
+module_param_named(force_new_ani, modparam_force_new_ani, int, 0444);
+MODULE_PARM_DESC(nohwcrypt, "Force new ANI for AR5008, AR9001, AR9002");
+
 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
 
 static bool ar9002_hw_macversion_supported(u32 macversion)
@@ -636,4 +640,9 @@ void ar9002_hw_attach_ops(struct ath_hw *ah)
 
         ar9002_hw_attach_calib_ops(ah);
         ar9002_hw_attach_mac_ops(ah);
+
+        if (modparam_force_new_ani)
+                ath9k_hw_attach_ani_ops_new(ah);
+        else
+                ath9k_hw_attach_ani_ops_old(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.h b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
index 81bf6e5840e1..ce8bb001c6d1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
@@ -114,6 +114,10 @@
 #define AR_PHY_FIND_SIG_FIRPWR    0x03FC0000
 #define AR_PHY_FIND_SIG_FIRPWR_S  18
 
+#define AR_PHY_FIND_SIG_LOW           0x9840
+#define AR_PHY_FIND_SIG_FIRSTEP_LOW   0x00000FC0L
+#define AR_PHY_FIND_SIG_FIRSTEP_LOW_S 6
+
 #define AR_PHY_AGC_CTL1                  0x985C
 #define AR_PHY_AGC_CTL1_COARSE_LOW       0x00007F80
 #define AR_PHY_AGC_CTL1_COARSE_LOW_S     7
@@ -325,6 +329,9 @@
 #define AR_PHY_EXT_CCA_CYCPWR_THR1_S    9
 #define AR_PHY_EXT_CCA_THRESH62         0x007F0000
 #define AR_PHY_EXT_CCA_THRESH62_S       16
+#define AR_PHY_EXT_TIMING5_CYCPWR_THR1   0x0000FE00L
+#define AR_PHY_EXT_TIMING5_CYCPWR_THR1_S 9
+
 #define AR_PHY_EXT_MINCCA_PWR           0xFF800000
 #define AR_PHY_EXT_MINCCA_PWR_S         23
 #define AR9280_PHY_EXT_MINCCA_PWR       0x01FF0000
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
index f82a00da82b8..d3375fc4ce8b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
@@ -835,71 +835,71 @@ static const u32 ar9300_2p0_baseband_core[][2] = {
 
 static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
         {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
         {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
@@ -913,71 +913,71 @@ static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
 
 static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p0[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
         {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
         {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 745150573793..ec98ab50748a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -835,71 +835,71 @@ static const u32 ar9300_2p2_baseband_core[][2] = {
 
 static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
         {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
         {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
@@ -913,71 +913,71 @@ static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
 
 static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p2[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
         {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
         {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 23eb60ea5455..343c9a427acb 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -67,6 +67,7 @@ static const struct ar9300_eeprom ar9300_default = {
                   * bit2 - enable fastClock - enabled
                   * bit3 - enable doubling - enabled
                   * bit4 - enable internal regulator - disabled
+                  * bit5 - enable pa predistortion - disabled
                   */
                 .miscConfiguration = 0, /* bit0 - turn down drivestrength */
                 .eepromWriteEnableGpio = 3,
@@ -129,9 +130,11 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
-                .futureModal = { /* [32] */
+                .papdRateMaskHt20 = LE32(0x80c080),
+                .papdRateMaskHt40 = LE32(0x80c080),
+                .futureModal = {
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0
                 },
          },
         .calFreqPier2G = {
@@ -326,9 +329,11 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0xf0e0e0),
+                .papdRateMaskHt40 = LE32(0xf0e0e0),
                 .futureModal = {
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0
                 },
          },
         .calFreqPier5G = {
@@ -644,6 +649,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
                 return (pBase->featureEnable & 0x10) >> 4;
         case EEP_SWREG:
                 return le32_to_cpu(pBase->swreg);
+        case EEP_PAPRD:
+                return !!(pBase->featureEnable & BIT(5));
         default:
                 return 0;
         }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 23fb353c3bba..3c533bb983c7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -234,7 +234,9 @@ struct ar9300_modal_eep_header {
         u8 txEndToRxOn;
         u8 txFrameToXpaOn;
         u8 thresh62;
-        u8 futureModal[32];
+        __le32 papdRateMaskHt20;
+        __le32 papdRateMaskHt40;
+        u8 futureModal[24];
 } __packed;
 
 struct ar9300_cal_data_per_freq_op_loop {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 863f61e3a16f..82c3ab756cd0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -313,4 +313,6 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
         ar9003_hw_attach_phy_ops(ah);
         ar9003_hw_attach_calib_ops(ah);
         ar9003_hw_attach_mac_ops(ah);
+
+        ath9k_hw_attach_ani_ops_new(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 40731077cbb4..06ef71019c12 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -470,6 +470,14 @@ static void ar9003_hw_set11n_virtualmorefrag(struct ath_hw *ah, void *ds,
                 ads->ctl11 &= ~AR_VirtMoreFrag;
 }
 
+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains)
+{
+        struct ar9003_txc *ads = ds;
+
+        ads->ctl12 |= SM(chains, AR_PAPRDChainMask);
+}
+EXPORT_SYMBOL(ar9003_hw_set_paprd_txdesc);
+
 void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
 {
         struct ath_hw_ops *ops = ath9k_hw_ops(hw);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
index 5a7a286e2773..f76f27d16f77 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
@@ -40,6 +40,10 @@
 
 #define AR_Not_Sounding 0x20000000
 
+/* ctl 12 */
+#define AR_PAPRDChainMask       0x00000e00
+#define AR_PAPRDChainMask_S     9
+
 #define MAP_ISR_S2_CST          6
 #define MAP_ISR_S2_GTT          6
 #define MAP_ISR_S2_TIM          3
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
new file mode 100644
index 000000000000..49e0c865ce5c
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -0,0 +1,714 @@
+/*
+ * Copyright (c) 2010 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "hw.h"
+#include "ar9003_phy.h"
+
+void ar9003_paprd_enable(struct ath_hw *ah, bool val)
+{
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B1,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B2,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+}
+EXPORT_SYMBOL(ar9003_paprd_enable);
+
+static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
+{
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+        struct ar9300_modal_eep_header *hdr;
+        const u32 ctrl0[3] = {
+                AR_PHY_PAPRD_CTRL0_B0,
+                AR_PHY_PAPRD_CTRL0_B1,
+                AR_PHY_PAPRD_CTRL0_B2
+        };
+        const u32 ctrl1[3] = {
+                AR_PHY_PAPRD_CTRL1_B0,
+                AR_PHY_PAPRD_CTRL1_B1,
+                AR_PHY_PAPRD_CTRL1_B2
+        };
+        u32 am_mask, ht40_mask;
+        int i;
+
+        if (ah->curchan && IS_CHAN_5GHZ(ah->curchan))
+                hdr = &eep->modalHeader5G;
+        else
+                hdr = &eep->modalHeader2G;
+
+        am_mask = le32_to_cpu(hdr->papdRateMaskHt20);
+        ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK, am_mask);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK, am_mask);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK, ht40_mask);
+
+        for (i = 0; i < 3; i++) {
+                REG_RMW_FIELD(ah, ctrl0[i],
+                              AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK, 181);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT, 361);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
+                REG_RMW_FIELD(ah, ctrl0[i],
+                              AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH, 3);
+        }
+
+        ar9003_paprd_enable(ah, false);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP, 0x30);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING, 28);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2,
+                      AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN, 147);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN, 4);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN, 4);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES, 7);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -6);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE,
+                      -15);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR, 400);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES,
+                      100);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_0_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 261376);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_1_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 248079);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_2_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 233759);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_3_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 220464);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_4_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 208194);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_5_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 196949);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_6_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 185706);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_7_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 175487);
+}
+
+static void ar9003_paprd_get_gain_table(struct ath_hw *ah)
+{
+        u32 *entry = ah->paprd_gain_table_entries;
+        u8 *index = ah->paprd_gain_table_index;
+        u32 reg = AR_PHY_TXGAIN_TABLE;
+        int i;
+
+        memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
+        memset(index, 0, sizeof(ah->paprd_gain_table_index));
+
+        for (i = 0; i < 32; i++) {
+                entry[i] = REG_READ(ah, reg);
+                index[i] = (entry[i] >> 24) & 0xff;
+                reg += 4;
+        }
+}
+
+static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
+                                            int target_power)
+{
+        int olpc_gain_delta = 0;
+        int alpha_therm, alpha_volt;
+        int therm_cal_value, volt_cal_value;
+        int therm_value, volt_value;
+        int thermal_gain_corr, voltage_gain_corr;
+        int desired_scale, desired_gain = 0;
+        u32 reg;
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+        desired_scale = REG_READ_FIELD(ah, AR_PHY_TPC_12,
+                                       AR_PHY_TPC_12_DESIRED_SCALE_HT40_5);
+        alpha_therm = REG_READ_FIELD(ah, AR_PHY_TPC_19,
+                                     AR_PHY_TPC_19_ALPHA_THERM);
+        alpha_volt = REG_READ_FIELD(ah, AR_PHY_TPC_19,
+                                    AR_PHY_TPC_19_ALPHA_VOLT);
+        therm_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
+                                         AR_PHY_TPC_18_THERM_CAL_VALUE);
+        volt_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
+                                        AR_PHY_TPC_18_VOLT_CAL_VALUE);
+        therm_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
+                                     AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE);
+        volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
+                                    AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
+
+        if (chain == 0)
+                reg = AR_PHY_TPC_11_B0;
+        else if (chain == 1)
+                reg = AR_PHY_TPC_11_B1;
+        else
+                reg = AR_PHY_TPC_11_B2;
+
+        olpc_gain_delta = REG_READ_FIELD(ah, reg,
+                                         AR_PHY_TPC_11_OLPC_GAIN_DELTA);
+
+        if (olpc_gain_delta >= 128)
+                olpc_gain_delta = olpc_gain_delta - 256;
+
+        thermal_gain_corr = (alpha_therm * (therm_value - therm_cal_value) +
+                             (256 / 2)) / 256;
+        voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
+                             (128 / 2)) / 128;
+        desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
+            voltage_gain_corr + desired_scale;
+
+        return desired_gain;
+}
+
+static void ar9003_tx_force_gain(struct ath_hw *ah, unsigned int gain_index)
+{
+        int selected_gain_entry, txbb1dbgain, txbb6dbgain, txmxrgain;
+        int padrvgnA, padrvgnB, padrvgnC, padrvgnD;
+        u32 *gain_table_entries = ah->paprd_gain_table_entries;
+
+        selected_gain_entry = gain_table_entries[gain_index];
+        txbb1dbgain = selected_gain_entry & 0x7;
+        txbb6dbgain = (selected_gain_entry >> 3) & 0x3;
+        txmxrgain = (selected_gain_entry >> 5) & 0xf;
+        padrvgnA = (selected_gain_entry >> 9) & 0xf;
+        padrvgnB = (selected_gain_entry >> 13) & 0xf;
+        padrvgnC = (selected_gain_entry >> 17) & 0xf;
+        padrvgnD = (selected_gain_entry >> 21) & 0x3;
+
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN, txbb1dbgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN, txbb6dbgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN, txmxrgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA, padrvgnA);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB, padrvgnB);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC, padrvgnC);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND, padrvgnD);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCED_DAC_GAIN, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCE_DAC_GAIN, 0);
+}
+
+static inline int find_expn(int num)
+{
+        return fls(num) - 1;
+}
+
+static inline int find_proper_scale(int expn, int N)
+{
+        return (expn > N) ? expn - 10 : 0;
+}
+
+#define NUM_BIN 23
+
+static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
+{
+        unsigned int thresh_accum_cnt;
+        int x_est[NUM_BIN + 1], Y[NUM_BIN + 1], theta[NUM_BIN + 1];
+        int PA_in[NUM_BIN + 1];
+        int B1_tmp[NUM_BIN + 1], B2_tmp[NUM_BIN + 1];
+        unsigned int B1_abs_max, B2_abs_max;
+        int max_index, scale_factor;
+        int y_est[NUM_BIN + 1];
+        int x_est_fxp1_nonlin, x_tilde[NUM_BIN + 1];
+        unsigned int x_tilde_abs;
+        int G_fxp, Y_intercept, order_x_by_y, M, I, L, sum_y_sqr, sum_y_quad;
+        int Q_x, Q_B1, Q_B2, beta_raw, alpha_raw, scale_B;
+        int Q_scale_B, Q_beta, Q_alpha, alpha, beta, order_1, order_2;
+        int order1_5x, order2_3x, order1_5x_rem, order2_3x_rem;
+        int y5, y3, tmp;
+        int theta_low_bin = 0;
+        int i;
+
+        /* disregard any bin that contains <= 16 samples */
+        thresh_accum_cnt = 16;
+        scale_factor = 5;
+        max_index = 0;
+        memset(theta, 0, sizeof(theta));
+        memset(x_est, 0, sizeof(x_est));
+        memset(Y, 0, sizeof(Y));
+        memset(y_est, 0, sizeof(y_est));
+        memset(x_tilde, 0, sizeof(x_tilde));
+
+        for (i = 0; i < NUM_BIN; i++) {
+                s32 accum_cnt, accum_tx, accum_rx, accum_ang;
+
+                /* number of samples */
+                accum_cnt = data_L[i] & 0xffff;
+
+                if (accum_cnt <= thresh_accum_cnt)
+                        continue;
+
+                /* sum(tx amplitude) */
+                accum_tx = ((data_L[i] >> 16) & 0xffff) |
+                    ((data_U[i] & 0x7ff) << 16);
+
+                /* sum(rx amplitude distance to lower bin edge) */
+                accum_rx = ((data_U[i] >> 11) & 0x1f) |
+                    ((data_L[i + 23] & 0xffff) << 5);
+
+                /* sum(angles) */
+                accum_ang = ((data_L[i + 23] >> 16) & 0xffff) |
+                    ((data_U[i + 23] & 0x7ff) << 16);
+
+                accum_tx <<= scale_factor;
+                accum_rx <<= scale_factor;
+                x_est[i + 1] = (((accum_tx + accum_cnt) / accum_cnt) + 32) >>
+                    scale_factor;
+
+                Y[i + 1] = ((((accum_rx + accum_cnt) / accum_cnt) + 32) >>
+                            scale_factor) +
+                            (1 << scale_factor) * max_index + 16;
+
+                if (accum_ang >= (1 << 26))
+                        accum_ang -= 1 << 27;
+
+                theta[i + 1] = ((accum_ang * (1 << scale_factor)) + accum_cnt) /
+                    accum_cnt;
+
+                max_index++;
+        }
+
+        /*
+         * Find average theta of first 5 bin and all of those to same value.
+         * Curve is linear at that range.
+         */
+        for (i = 1; i < 6; i++)
+                theta_low_bin += theta[i];
+
+        theta_low_bin = theta_low_bin / 5;
+        for (i = 1; i < 6; i++)
+                theta[i] = theta_low_bin;
+
+        /* Set values at origin */
+        theta[0] = theta_low_bin;
+        for (i = 0; i <= max_index; i++)
+                theta[i] -= theta_low_bin;
+
+        x_est[0] = 0;
+        Y[0] = 0;
+        scale_factor = 8;
+
+        /* low signal gain */
+        if (x_est[6] == x_est[3])
+                return false;
+
+        G_fxp =
+            (((Y[6] - Y[3]) * 1 << scale_factor) +
+             (x_est[6] - x_est[3])) / (x_est[6] - x_est[3]);
+
+        Y_intercept =
+            (G_fxp * (x_est[0] - x_est[3]) +
+             (1 << scale_factor)) / (1 << scale_factor) + Y[3];
+
+        for (i = 0; i <= max_index; i++)
+                y_est[i] = Y[i] - Y_intercept;
+
+        for (i = 0; i <= 3; i++) {
+                y_est[i] = i * 32;
+
+                /* prevent division by zero */
+                if (G_fxp == 0)
+                        return false;
+
+                x_est[i] = ((y_est[i] * 1 << scale_factor) + G_fxp) / G_fxp;
+        }
+
+        x_est_fxp1_nonlin =
+            x_est[max_index] - ((1 << scale_factor) * y_est[max_index] +
+                                G_fxp) / G_fxp;
+
+        order_x_by_y =
+            (x_est_fxp1_nonlin + y_est[max_index]) / y_est[max_index];
+
+        if (order_x_by_y == 0)
+                M = 10;
+        else if (order_x_by_y == 1)
+                M = 9;
+        else
+                M = 8;
+
+        I = (max_index > 15) ? 7 : max_index >> 1;
+        L = max_index - I;
+        scale_factor = 8;
+        sum_y_sqr = 0;
+        sum_y_quad = 0;
+        x_tilde_abs = 0;
+
+        for (i = 0; i <= L; i++) {
+                unsigned int y_sqr;
+                unsigned int y_quad;
+                unsigned int tmp_abs;
+
+                /* prevent division by zero */
+                if (y_est[i + I] == 0)
+                        return false;
+
+                x_est_fxp1_nonlin =
+                    x_est[i + I] - ((1 << scale_factor) * y_est[i + I] +
+                                    G_fxp) / G_fxp;
+
+                x_tilde[i] =
+                    (x_est_fxp1_nonlin * (1 << M) + y_est[i + I]) / y_est[i +
+                                                                          I];
+                x_tilde[i] =
+                    (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
+                x_tilde[i] =
+                    (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
+                y_sqr =
+                    (y_est[i + I] * y_est[i + I] +
+                     (scale_factor * scale_factor)) / (scale_factor *
+                                                       scale_factor);
+                tmp_abs = abs(x_tilde[i]);
+                if (tmp_abs > x_tilde_abs)
+                        x_tilde_abs = tmp_abs;
+
+                y_quad = y_sqr * y_sqr;
+                sum_y_sqr = sum_y_sqr + y_sqr;
+                sum_y_quad = sum_y_quad + y_quad;
+                B1_tmp[i] = y_sqr * (L + 1);
+                B2_tmp[i] = y_sqr;
+        }
+
+        B1_abs_max = 0;
+        B2_abs_max = 0;
+        for (i = 0; i <= L; i++) {
+                int abs_val;
+
+                B1_tmp[i] -= sum_y_sqr;
+                B2_tmp[i] = sum_y_quad - sum_y_sqr * B2_tmp[i];
+
+                abs_val = abs(B1_tmp[i]);
+                if (abs_val > B1_abs_max)
+                        B1_abs_max = abs_val;
+
+                abs_val = abs(B2_tmp[i]);
+                if (abs_val > B2_abs_max)
+                        B2_abs_max = abs_val;
+        }
+
+        Q_x = find_proper_scale(find_expn(x_tilde_abs), 10);
+        Q_B1 = find_proper_scale(find_expn(B1_abs_max), 10);
+        Q_B2 = find_proper_scale(find_expn(B2_abs_max), 10);
+
+        beta_raw = 0;
+        alpha_raw = 0;
+        for (i = 0; i <= L; i++) {
+                x_tilde[i] = x_tilde[i] / (1 << Q_x);
+                B1_tmp[i] = B1_tmp[i] / (1 << Q_B1);
+                B2_tmp[i] = B2_tmp[i] / (1 << Q_B2);
+                beta_raw = beta_raw + B1_tmp[i] * x_tilde[i];
+                alpha_raw = alpha_raw + B2_tmp[i] * x_tilde[i];
+        }
+
+        scale_B =
+            ((sum_y_quad / scale_factor) * (L + 1) -
+             (sum_y_sqr / scale_factor) * sum_y_sqr) * scale_factor;
+
+        Q_scale_B = find_proper_scale(find_expn(abs(scale_B)), 10);
+        scale_B = scale_B / (1 << Q_scale_B);
+        Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
+        Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
+        beta_raw = beta_raw / (1 << Q_beta);
+        alpha_raw = alpha_raw / (1 << Q_alpha);
+        alpha = (alpha_raw << 10) / scale_B;
+        beta = (beta_raw << 10) / scale_B;
+        order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B;
+        order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B;
+        order1_5x = order_1 / 5;
+        order2_3x = order_2 / 3;
+        order1_5x_rem = order_1 - 5 * order1_5x;
+        order2_3x_rem = order_2 - 3 * order2_3x;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                tmp = i * 32;
+                y5 = ((beta * tmp) >> 6) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = y5 >> order1_5x_rem;
+                y3 = (alpha * tmp) >> order2_3x;
+                y3 = (y3 * tmp) >> order2_3x;
+                y3 = (y3 * tmp) >> order2_3x;
+                y3 = y3 >> order2_3x_rem;
+                PA_in[i] = y5 + y3 + (256 * tmp) / G_fxp;
+
+                if (i >= 2) {
+                        tmp = PA_in[i] - PA_in[i - 1];
+                        if (tmp < 0)
+                                PA_in[i] =
+                                    PA_in[i - 1] + (PA_in[i - 1] -
+                                                    PA_in[i - 2]);
+                }
+
+                PA_in[i] = (PA_in[i] < 1400) ? PA_in[i] : 1400;
+        }
+
+        beta_raw = 0;
+        alpha_raw = 0;
+
+        for (i = 0; i <= L; i++) {
+                int theta_tilde =
+                    ((theta[i + I] << M) + y_est[i + I]) / y_est[i + I];
+                theta_tilde =
+                    ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
+                theta_tilde =
+                    ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
+                beta_raw = beta_raw + B1_tmp[i] * theta_tilde;
+                alpha_raw = alpha_raw + B2_tmp[i] * theta_tilde;
+        }
+
+        Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
+        Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
+        beta_raw = beta_raw / (1 << Q_beta);
+        alpha_raw = alpha_raw / (1 << Q_alpha);
+
+        alpha = (alpha_raw << 10) / scale_B;
+        beta = (beta_raw << 10) / scale_B;
+        order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B + 5;
+        order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B + 5;
+        order1_5x = order_1 / 5;
+        order2_3x = order_2 / 3;
+        order1_5x_rem = order_1 - 5 * order1_5x;
+        order2_3x_rem = order_2 - 3 * order2_3x;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                int PA_angle;
+
+                /* pa_table[4] is calculated from PA_angle for i=5 */
+                if (i == 4)
+                        continue;
+
+                tmp = i * 32;
+                if (beta > 0)
+                        y5 = (((beta * tmp - 64) >> 6) -
+                              (1 << order1_5x)) / (1 << order1_5x);
+                else
+                        y5 = ((((beta * tmp - 64) >> 6) +
+                               (1 << order1_5x)) / (1 << order1_5x));
+
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = y5 / (1 << order1_5x_rem);
+
+                if (beta > 0)
+                        y3 = (alpha * tmp -
+                              (1 << order2_3x)) / (1 << order2_3x);
+                else
+                        y3 = (alpha * tmp +
+                              (1 << order2_3x)) / (1 << order2_3x);
+                y3 = (y3 * tmp) / (1 << order2_3x);
+                y3 = (y3 * tmp) / (1 << order2_3x);
+                y3 = y3 / (1 << order2_3x_rem);
+
+                if (i < 4) {
+                        PA_angle = 0;
+                } else {
+                        PA_angle = y5 + y3;
+                        if (PA_angle < -150)
+                                PA_angle = -150;
+                        else if (PA_angle > 150)
+                                PA_angle = 150;
+                }
+
+                pa_table[i] = ((PA_in[i] & 0x7ff) << 11) + (PA_angle & 0x7ff);
+                if (i == 5) {
+                        PA_angle = (PA_angle + 2) >> 1;
+                        pa_table[i - 1] = ((PA_in[i - 1] & 0x7ff) << 11) +
+                            (PA_angle & 0x7ff);
+                }
+        }
+
+        *gain = G_fxp;
+        return true;
+}
+
+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
+                                        struct ath9k_channel *chan, int chain)
+{
+        u32 *paprd_table_val = chan->pa_table[chain];
+        u32 small_signal_gain = chan->small_signal_gain[chain];
+        u32 training_power;
+        u32 reg = 0;
+        int i;
+
+        training_power =
+            REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
+                           AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
+        training_power -= 4;
+
+        if (chain == 0)
+                reg = AR_PHY_PAPRD_MEM_TAB_B0;
+        else if (chain == 1)
+                reg = AR_PHY_PAPRD_MEM_TAB_B1;
+        else if (chain == 2)
+                reg = AR_PHY_PAPRD_MEM_TAB_B2;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                REG_WRITE(ah, reg, paprd_table_val[i]);
+                reg = reg + 4;
+        }
+
+        if (chain == 0)
+                reg = AR_PHY_PA_GAIN123_B0;
+        else if (chain == 1)
+                reg = AR_PHY_PA_GAIN123_B1;
+        else
+                reg = AR_PHY_PA_GAIN123_B2;
+
+        REG_RMW_FIELD(ah, reg, AR_PHY_PA_GAIN123_PA_GAIN1, small_signal_gain);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B0,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B1,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B2,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+}
+EXPORT_SYMBOL(ar9003_paprd_populate_single_table);
+
+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain)
+{
+
+        unsigned int i, desired_gain, gain_index;
+        unsigned int train_power;
+
+        train_power = REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
+                                     AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
+
+        train_power = train_power - 4;
+
+        desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
+
+        gain_index = 0;
+        for (i = 0; i < 32; i++) {
+                if (ah->paprd_gain_table_index[i] >= desired_gain)
+                        break;
+                gain_index++;
+        }
+
+        ar9003_tx_force_gain(ah, gain_index);
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                        AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+
+        return 0;
+}
+EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
+
+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
+                              int chain)
+{
+        u16 *small_signal_gain = &chan->small_signal_gain[chain];
+        u32 *pa_table = chan->pa_table[chain];
+        u32 *data_L, *data_U;
+        int i, status = 0;
+        u32 *buf;
+        u32 reg;
+
+        memset(chan->pa_table[chain], 0, sizeof(chan->pa_table[chain]));
+
+        buf = kmalloc(2 * 48 * sizeof(u32), GFP_ATOMIC);
+        if (!buf)
+                return -ENOMEM;
+
+        data_L = &buf[0];
+        data_U = &buf[48];
+
+        REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
+                    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
+
+        reg = AR_PHY_CHAN_INFO_TAB_0;
+        for (i = 0; i < 48; i++)
+                data_L[i] = REG_READ(ah, reg + (i << 2));
+
+        REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
+                    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
+
+        for (i = 0; i < 48; i++)
+                data_U[i] = REG_READ(ah, reg + (i << 2));
+
+        if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
+                status = -2;
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+
+        kfree(buf);
+
+        return status;
+}
+EXPORT_SYMBOL(ar9003_paprd_create_curve);
+
+int ar9003_paprd_init_table(struct ath_hw *ah)
+{
+        ar9003_paprd_setup_single_table(ah);
+        ar9003_paprd_get_gain_table(ah);
+        return 0;
+}
+EXPORT_SYMBOL(ar9003_paprd_init_table);
+
+bool ar9003_paprd_is_done(struct ath_hw *ah)
+{
+        return !!REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                                AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+}
+EXPORT_SYMBOL(ar9003_paprd_is_done);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index c714579b5483..19bc05c41136 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -17,6 +17,28 @@
 #include "hw.h"
 #include "ar9003_phy.h"
 
+static const int firstep_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -4, -2,  0,  2,  4,  6,  8, 10, 12 }; /* lvl 0-8, default 2 */
+
+static const int cycpwrThr1_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -6, -4, -2,  0,  2,  4,  6,  8 };     /* lvl 0-7, default 3 */
+
+/*
+ * register values to turn OFDM weak signal detection OFF
+ */
+static const int m1ThreshLow_off = 127;
+static const int m2ThreshLow_off = 127;
+static const int m1Thresh_off = 127;
+static const int m2Thresh_off = 127;
+static const int m2CountThr_off =  31;
+static const int m2CountThrLow_off =  63;
+static const int m1ThreshLowExt_off = 127;
+static const int m2ThreshLowExt_off = 127;
+static const int m1ThreshExt_off = 127;
+static const int m2ThreshExt_off = 127;
+
 /**
  * ar9003_hw_set_channel - set channel on single-chip device
  * @ah: atheros hardware structure
@@ -94,7 +116,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 }
 
 /**
- * ar9003_hw_spur_mitigate - convert baseband spur frequency
+ * ar9003_hw_spur_mitigate_mrc_cck - convert baseband spur frequency
  * @ah: atheros hardware structure
  * @chan:
  *
@@ -521,15 +543,6 @@ static void ar9003_hw_prog_ini(struct ath_hw *ah,
                 u32 val = INI_RA(iniArr, i, column);
 
                 REG_WRITE(ah, reg, val);
-
-                /*
-                 * Determine if this is a shift register value, and insert the
-                 * configured delay if so.
-                 */
-                if (reg >= 0x16000 && reg < 0x17000
-                    && ah->config.analog_shiftreg)
-                        udelay(100);
-
                 DO_DELAY(regWrites);
         }
 }
@@ -732,71 +745,68 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
 {
         struct ar5416AniState *aniState = ah->curani;
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        s32 value, value2;
 
         switch (cmd & ah->ani_function) {
-        case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(ah->totalSizeDesired)) {
-                        ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
-                                  level,
-                                  (unsigned)ARRAY_SIZE(ah->totalSizeDesired));
-                        return false;
-                }
-
-                REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,
-                              AR_PHY_DESIRED_SZ_TOT_DES,
-                              ah->totalSizeDesired[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC,
-                              AR_PHY_AGC_COARSE_LOW,
-                              ah->coarse_low[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC,
-                              AR_PHY_AGC_COARSE_HIGH,
-                              ah->coarse_high[level]);
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRPWR, ah->firpwr[level]);
-
-                if (level > aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_niup++;
-                else if (level < aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_nidown++;
-                aniState->noiseImmunityLevel = level;
-                break;
-        }
         case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                const int m1ThreshLow[] = { 127, 50 };
-                const int m2ThreshLow[] = { 127, 40 };
-                const int m1Thresh[] = { 127, 0x4d };
-                const int m2Thresh[] = { 127, 0x40 };
-                const int m2CountThr[] = { 31, 16 };
-                const int m2CountThrLow[] = { 63, 48 };
+                /*
+                 * on == 1 means ofdm weak signal detection is ON
+                 * on == 1 is the default, for less noise immunity
+                 *
+                 * on == 0 means ofdm weak signal detection is OFF
+                 * on == 0 means more noise imm
+                 */
                 u32 on = param ? 1 : 0;
+                /*
+                 * make register setting for default
+                 * (weak sig detect ON) come from INI file
+                 */
+                int m1ThreshLow = on ?
+                        aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+                int m2ThreshLow = on ?
+                        aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+                int m1Thresh = on ?
+                        aniState->iniDef.m1Thresh : m1Thresh_off;
+                int m2Thresh = on ?
+                        aniState->iniDef.m2Thresh : m2Thresh_off;
+                int m2CountThr = on ?
+                        aniState->iniDef.m2CountThr : m2CountThr_off;
+                int m2CountThrLow = on ?
+                        aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+                int m1ThreshLowExt = on ?
+                        aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+                int m2ThreshLowExt = on ?
+                        aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+                int m1ThreshExt = on ?
+                        aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+                int m2ThreshExt = on ?
+                        aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
 
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
-                              m1ThreshLow[on]);
+                              m1ThreshLow);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
-                              m2ThreshLow[on]);
+                              m2ThreshLow);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M1_THRESH, m1Thresh[on]);
+                              AR_PHY_SFCORR_M1_THRESH, m1Thresh);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2_THRESH, m2Thresh[on]);
+                              AR_PHY_SFCORR_M2_THRESH, m2Thresh);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr[on]);
+                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
-                              m2CountThrLow[on]);
+                              m2CountThrLow);
 
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLow[on]);
+                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLow[on]);
+                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH, m1Thresh[on]);
+                              AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH, m2Thresh[on]);
+                              AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
 
                 if (on)
                         REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
@@ -806,6 +816,12 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
                 if (!on != aniState->ofdmWeakSigDetectOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: ofdm weak signal: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->ofdmWeakSigDetectOff ?
+                                        "on" : "off",
+                                  on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
@@ -814,64 +830,167 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                 }
                 break;
         }
-        case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
-                const int weakSigThrCck[] = { 8, 6 };
-                u32 high = param ? 1 : 0;
-
-                REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
-                              AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK,
-                              weakSigThrCck[high]);
-                if (high != aniState->cckWeakSigThreshold) {
-                        if (high)
-                                ah->stats.ast_ani_cckhigh++;
-                        else
-                                ah->stats.ast_ani_ccklow++;
-                        aniState->cckWeakSigThreshold = high;
-                }
-                break;
-        }
         case ATH9K_ANI_FIRSTEP_LEVEL:{
-                const int firstep[] = { 0, 4, 8 };
                 u32 level = param;
 
-                if (level >= ARRAY_SIZE(firstep)) {
+                if (level >= ARRAY_SIZE(firstep_table)) {
                         ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
+                                  "ATH9K_ANI_FIRSTEP_LEVEL: level "
+                                  "out of range (%u > %u)\n",
                                   level,
-                                  (unsigned) ARRAY_SIZE(firstep));
+                                  (unsigned) ARRAY_SIZE(firstep_table));
                         return false;
                 }
+
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = firstep_table[level] -
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        aniState->iniDef.firstep;
+                if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MAX;
                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
                               AR_PHY_FIND_SIG_FIRSTEP,
-                              firstep[level]);
-                if (level > aniState->firstepLevel)
-                        ah->stats.ast_ani_stepup++;
-                else if (level < aniState->firstepLevel)
-                        ah->stats.ast_ani_stepdown++;
-                aniState->firstepLevel = level;
+                              value);
+                /*
+                 * we need to set first step low register too
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = firstep_table[level] -
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         aniState->iniDef.firstepLow;
+                if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value2 > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
+                              AR_PHY_FIND_SIG_LOW_FIRSTEP_LOW, value2);
+
+                if (level != aniState->firstepLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.firstep);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep_low[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.firstepLow);
+                        if (level > aniState->firstepLevel)
+                                ah->stats.ast_ani_stepup++;
+                        else if (level < aniState->firstepLevel)
+                                ah->stats.ast_ani_stepdown++;
+                        aniState->firstepLevel = level;
+                }
                 break;
         }
         case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
-                const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
                 u32 level = param;
 
-                if (level >= ARRAY_SIZE(cycpwrThr1)) {
+                if (level >= ARRAY_SIZE(cycpwrThr1_table)) {
                         ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
+                                  "ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level "
+                                  "out of range (%u > %u)\n",
                                   level,
-                                  (unsigned) ARRAY_SIZE(cycpwrThr1));
+                                  (unsigned) ARRAY_SIZE(cycpwrThr1_table));
                         return false;
                 }
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = cycpwrThr1_table[level] -
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        aniState->iniDef.cycpwrThr1;
+                if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
                 REG_RMW_FIELD(ah, AR_PHY_TIMING5,
                               AR_PHY_TIMING5_CYCPWR_THR1,
-                              cycpwrThr1[level]);
-                if (level > aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurup++;
-                else if (level < aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurdown++;
-                aniState->spurImmunityLevel = level;
+                              value);
+
+                /*
+                 * set AR_PHY_EXT_CCA for extension channel
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = cycpwrThr1_table[level] -
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         aniState->iniDef.cycpwrThr1Ext;
+                if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value2 > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
+                              AR_PHY_EXT_CYCPWR_THR1, value2);
+
+                if (level != aniState->spurImmunityLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.cycpwrThr1);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1Ext[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.cycpwrThr1Ext);
+                        if (level > aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurup++;
+                        else if (level < aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurdown++;
+                        aniState->spurImmunityLevel = level;
+                }
                 break;
         }
+        case ATH9K_ANI_MRC_CCK:{
+                /*
+                 * is_on == 1 means MRC CCK ON (default, less noise imm)
+                 * is_on == 0 means MRC CCK is OFF (more noise imm)
+                 */
+                bool is_on = param ? 1 : 0;
+                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+                              AR_PHY_MRC_CCK_ENABLE, is_on);
+                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+                              AR_PHY_MRC_CCK_MUX_REG, is_on);
+                if (!is_on != aniState->mrcCCKOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: MRC CCK: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->mrcCCKOff ? "on" : "off",
+                                  is_on ? "on" : "off");
+                if (is_on)
+                        ah->stats.ast_ani_ccklow++;
+                else
+                        ah->stats.ast_ani_cckhigh++;
+                aniState->mrcCCKOff = !is_on;
+                }
+        break;
+        }
         case ATH9K_ANI_PRESENT:
                 break;
         default:
@@ -880,25 +999,19 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                 return false;
         }
 
-        ath_print(common, ATH_DBG_ANI, "ANI parameters:\n");
         ath_print(common, ATH_DBG_ANI,
-                  "noiseImmunityLevel=%d, spurImmunityLevel=%d, "
-                  "ofdmWeakSigDetectOff=%d\n",
-                  aniState->noiseImmunityLevel,
+                  "ANI parameters: SI=%d, ofdmWS=%s FS=%d "
+                  "MRCcck=%s listenTime=%d CC=%d listen=%d "
+                  "ofdmErrs=%d cckErrs=%d\n",
                   aniState->spurImmunityLevel,
-                  !aniState->ofdmWeakSigDetectOff);
-        ath_print(common, ATH_DBG_ANI,
-                  "cckWeakSigThreshold=%d, "
-                  "firstepLevel=%d, listenTime=%d\n",
-                  aniState->cckWeakSigThreshold,
+                  !aniState->ofdmWeakSigDetectOff ? "on" : "off",
                   aniState->firstepLevel,
-                  aniState->listenTime);
-        ath_print(common, ATH_DBG_ANI,
-                "cycleCount=%d, ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",
-                aniState->cycleCount,
-                aniState->ofdmPhyErrCount,
-                aniState->cckPhyErrCount);
-
+                  !aniState->mrcCCKOff ? "on" : "off",
+                  aniState->listenTime,
+                  aniState->cycleCount,
+                  aniState->listenTime,
+                  aniState->ofdmPhyErrCount,
+                  aniState->cckPhyErrCount);
         return true;
 }
 
@@ -1111,6 +1224,70 @@ static void ar9003_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
         }
 }
 
+/*
+ * Initialize the ANI register values with default (ini) values.
+ * This routine is called during a (full) hardware reset after
+ * all the registers are initialised from the INI.
+ */
+static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath9k_ani_default *iniDef;
+        int index;
+        u32 val;
+
+        index = ath9k_hw_get_ani_channel_idx(ah, chan);
+        aniState = &ah->ani[index];
+        ah->curani = aniState;
+        iniDef = &aniState->iniDef;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
+                  ah->hw_version.macVersion,
+                  ah->hw_version.macRev,
+                  ah->opmode,
+                  chan->channel,
+                  chan->channelFlags);
+
+        val = REG_READ(ah, AR_PHY_SFCORR);
+        iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
+        iniDef->m2Thresh = MS(val, AR_PHY_SFCORR_M2_THRESH);
+        iniDef->m2CountThr = MS(val, AR_PHY_SFCORR_M2COUNT_THR);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_LOW);
+        iniDef->m1ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M1_THRESH_LOW);
+        iniDef->m2ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M2_THRESH_LOW);
+        iniDef->m2CountThrLow = MS(val, AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_EXT);
+        iniDef->m1ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH);
+        iniDef->m2ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH);
+        iniDef->m1ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH_LOW);
+        iniDef->m2ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH_LOW);
+        iniDef->firstep = REG_READ_FIELD(ah,
+                                         AR_PHY_FIND_SIG,
+                                         AR_PHY_FIND_SIG_FIRSTEP);
+        iniDef->firstepLow = REG_READ_FIELD(ah,
+                                            AR_PHY_FIND_SIG_LOW,
+                                            AR_PHY_FIND_SIG_LOW_FIRSTEP_LOW);
+        iniDef->cycpwrThr1 = REG_READ_FIELD(ah,
+                                            AR_PHY_TIMING5,
+                                            AR_PHY_TIMING5_CYCPWR_THR1);
+        iniDef->cycpwrThr1Ext = REG_READ_FIELD(ah,
+                                               AR_PHY_EXT_CCA,
+                                               AR_PHY_EXT_CYCPWR_THR1);
+
+        /* these levels just got reset to defaults by the INI */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
+
+        aniState->cycleCount = 0;
+}
+
 void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -1131,6 +1308,7 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->ani_control = ar9003_hw_ani_control;
         priv_ops->do_getnf = ar9003_hw_do_getnf;
         priv_ops->loadnf = ar9003_hw_loadnf;
+        priv_ops->ani_cache_ini_regs = ar9003_hw_ani_cache_ini_regs;
 }
 
 void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 676d3f1123f4..3394dfe52b42 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -149,6 +149,8 @@
 #define AR_PHY_EXT_CCA_THRESH62_S       16
 #define AR_PHY_EXT_MINCCA_PWR   0x01FF0000
 #define AR_PHY_EXT_MINCCA_PWR_S 16
+#define AR_PHY_EXT_CYCPWR_THR1 0x0000FE00L
+#define AR_PHY_EXT_CYCPWR_THR1_S 9
 #define AR_PHY_TIMING5_CYCPWR_THR1  0x000000FE
 #define AR_PHY_TIMING5_CYCPWR_THR1_S    1
 #define AR_PHY_TIMING5_CYCPWR_THR1_ENABLE  0x00000001
@@ -283,6 +285,12 @@
 #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ                           0x1ffffe00
 #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ_S                                  9
 
+#define AR_PHY_MRC_CCK_CTRL         (AR_AGC_BASE + 0x1d0)
+#define AR_PHY_MRC_CCK_ENABLE       0x00000001
+#define AR_PHY_MRC_CCK_ENABLE_S              0
+#define AR_PHY_MRC_CCK_MUX_REG      0x00000002
+#define AR_PHY_MRC_CCK_MUX_REG_S             1
+
 #define AR_PHY_RX_OCGAIN        (AR_AGC_BASE + 0x200)
 
 #define AR_PHY_CCA_NOM_VAL_9300_2GHZ          -110
@@ -451,7 +459,11 @@
 #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)
 
 #define AR_PHY_CHAN_STATUS       (AR_SM_BASE + 0x16c)
-#define AR_PHY_CHAN_INFO_MEMORY  (AR_SM_BASE + 0x170)
+
+#define AR_PHY_CHAN_INFO_MEMORY                         (AR_SM_BASE + 0x170)
+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ     0x00000008
+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ_S   3
+
 #define AR_PHY_CHNINFO_NOISEPWR  (AR_SM_BASE + 0x174)
 #define AR_PHY_CHNINFO_GAINDIFF  (AR_SM_BASE + 0x178)
 #define AR_PHY_CHNINFO_FINETIM   (AR_SM_BASE + 0x17c)
@@ -467,17 +479,63 @@
 #define AR_PHY_PWRTX_MAX         (AR_SM_BASE + 0x1f0)
 #define AR_PHY_POWER_TX_SUB      (AR_SM_BASE + 0x1f4)
 
-#define AR_PHY_TPC_4_B0          (AR_SM_BASE + 0x204)
-#define AR_PHY_TPC_5_B0          (AR_SM_BASE + 0x208)
-#define AR_PHY_TPC_6_B0          (AR_SM_BASE + 0x20c)
-#define AR_PHY_TPC_11_B0         (AR_SM_BASE + 0x220)
-#define AR_PHY_TPC_18            (AR_SM_BASE + 0x23c)
-#define AR_PHY_TPC_19            (AR_SM_BASE + 0x240)
+#define AR_PHY_TPC_1                            (AR_SM_BASE + 0x1f8)
+#define AR_PHY_TPC_1_FORCED_DAC_GAIN            0x0000003e
+#define AR_PHY_TPC_1_FORCED_DAC_GAIN_S          1
+#define AR_PHY_TPC_1_FORCE_DAC_GAIN             0x00000001
+#define AR_PHY_TPC_1_FORCE_DAC_GAIN_S           0
+
+#define AR_PHY_TPC_4_B0                         (AR_SM_BASE + 0x204)
+#define AR_PHY_TPC_5_B0                         (AR_SM_BASE + 0x208)
+#define AR_PHY_TPC_6_B0                         (AR_SM_BASE + 0x20c)
+
+#define AR_PHY_TPC_11_B0                        (AR_SM_BASE + 0x220)
+#define AR_PHY_TPC_11_B1                        (AR_SM1_BASE + 0x220)
+#define AR_PHY_TPC_11_B2                        (AR_SM2_BASE + 0x220)
+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA           0x00ff0000
+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA_S         16
+
+#define AR_PHY_TPC_12                           (AR_SM_BASE + 0x224)
+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5      0x3e000000
+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5_S    25
+
+#define AR_PHY_TPC_18                           (AR_SM_BASE + 0x23c)
+#define AR_PHY_TPC_18_THERM_CAL_VALUE           0x000000ff
+#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
+#define AR_PHY_TPC_18_VOLT_CAL_VALUE            0x0000ff00
+#define AR_PHY_TPC_18_VOLT_CAL_VALUE_S          8
+
+#define AR_PHY_TPC_19                           (AR_SM_BASE + 0x240)
+#define AR_PHY_TPC_19_ALPHA_VOLT                0x001f0000
+#define AR_PHY_TPC_19_ALPHA_VOLT_S              16
+#define AR_PHY_TPC_19_ALPHA_THERM               0xff
+#define AR_PHY_TPC_19_ALPHA_THERM_S             0
+
+#define AR_PHY_TX_FORCED_GAIN                           (AR_SM_BASE + 0x258)
+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN             0x00000001
+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN_S           0
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN        0x0000000e
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN_S      1
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN        0x00000030
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN_S      4
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN          0x000003c0
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN_S        6
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA           0x00003c00
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA_S         10
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB           0x0003c000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB_S         14
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC           0x003c0000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC_S         18
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND           0x00c00000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND_S         22
+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL         0x01000000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL_S       24
 
-#define AR_PHY_TX_FORCED_GAIN    (AR_SM_BASE + 0x258)
 
 #define AR_PHY_PDADC_TAB_0       (AR_SM_BASE + 0x280)
 
+#define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
+
 #define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + 0x448)
 #define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + 0x440)
 #define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
@@ -490,7 +548,17 @@
 #define AR_PHY_ONLY_WARMRESET       (AR_SM_BASE + 0x5d0)
 #define AR_PHY_ONLY_CTL             (AR_SM_BASE + 0x5d4)
 #define AR_PHY_ECO_CTRL             (AR_SM_BASE + 0x5dc)
-#define AR_PHY_BB_THERM_ADC_1       (AR_SM_BASE + 0x248)
+
+#define AR_PHY_BB_THERM_ADC_1                           (AR_SM_BASE + 0x248)
+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM                0x000000ff
+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S              0
+
+#define AR_PHY_BB_THERM_ADC_4                           (AR_SM_BASE + 0x254)
+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE        0x000000ff
+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE_S      0
+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE         0x0000ff00
+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE_S       8
+
 
 #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
 #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   0x00000002
@@ -660,17 +728,9 @@
 #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE      0x00003fff
 #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE_S    0
 
-#define AR_PHY_TPC_18_THERM_CAL_VALUE           0xff
-#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
-#define AR_PHY_TPC_19_ALPHA_THERM               0xff
-#define AR_PHY_TPC_19_ALPHA_THERM_S             0
-
 #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
 #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
 
-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM        0x000000ff
-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S      0
-
 /*
  * Channel 1 Register Map
  */
@@ -842,6 +902,144 @@
 
 #define AR_PHY_WATCHDOG_STATUS_CLR         0x00000008
 
+/*
+ * PAPRD registers
+ */
+#define AR_PHY_XPA_TIMING_CTL           (AR_SM_BASE + 0x64)
+
+#define AR_PHY_PAPRD_AM2AM              (AR_CHAN_BASE + 0xe4)
+#define AR_PHY_PAPRD_AM2AM_MASK         0x01ffffff
+#define AR_PHY_PAPRD_AM2AM_MASK_S       0
+
+#define AR_PHY_PAPRD_AM2PM              (AR_CHAN_BASE + 0xe8)
+#define AR_PHY_PAPRD_AM2PM_MASK         0x01ffffff
+#define AR_PHY_PAPRD_AM2PM_MASK_S       0
+
+#define AR_PHY_PAPRD_HT40               (AR_CHAN_BASE + 0xec)
+#define AR_PHY_PAPRD_HT40_MASK          0x01ffffff
+#define AR_PHY_PAPRD_HT40_MASK_S        0
+
+#define AR_PHY_PAPRD_CTRL0_B0                           (AR_CHAN_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_B1                           (AR_CHAN1_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_B2                           (AR_CHAN2_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE                 0x00000001
+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE_S               0
+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK        0x00000002
+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK_S      1
+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH              0xf8000000
+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH_S            27
+
+#define AR_PHY_PAPRD_CTRL1_B0                           (AR_CHAN_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_B1                           (AR_CHAN1_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_B2                           (AR_CHAN2_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA         0x00000001
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA_S       0
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE        0x00000002
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE_S      1
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE        0x00000004
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE_S      2
+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL     0x000001f8
+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL_S   3
+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK      0x0001fe00
+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK_S    9
+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT         0x0ffe0000
+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT_S       17
+
+#define AR_PHY_PAPRD_TRAINER_CNTL1                              (AR_SM_BASE + 0x490)
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE     0x00000001
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE_S   0
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING       0x0000007e
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING_S     1
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE       0x00000100
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE_S     8
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE    0x00000200
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE_S  9
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE       0x00000400
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE_S     10
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE           0x00000800
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE_S         11
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP             0x0003f000
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP_S           12
+
+#define AR_PHY_PAPRD_TRAINER_CNTL2                              (AR_SM_BASE + 0x494)
+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN     0xFFFFFFFF
+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN_S   0
+
+#define AR_PHY_PAPRD_TRAINER_CNTL3                              (AR_SM_BASE + 0x498)
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE    0x0000003f
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE_S  0
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP          0x00000fc0
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP_S        6
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL    0x0001f000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL_S  12
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES     0x000e0000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES_S   17
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN     0x00f00000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN_S   20
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN       0x0f000000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN_S     24
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE     0x20000000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE_S   29
+
+#define AR_PHY_PAPRD_TRAINER_CNTL4                              (AR_SM_BASE + 0x49c)
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES   0x03ff0000
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES_S 16
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA        0x0000f000
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA_S      12
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR            0x00000fff
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR_S          0
+
+#define AR_PHY_PAPRD_PRE_POST_SCALE_0_B0                        (AR_CHAN_BASE + 0x100)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_1_B0                        (AR_CHAN_BASE + 0x104)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_2_B0                        (AR_CHAN_BASE + 0x108)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_3_B0                        (AR_CHAN_BASE + 0x10c)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_4_B0                        (AR_CHAN_BASE + 0x110)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_5_B0                        (AR_CHAN_BASE + 0x114)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_6_B0                        (AR_CHAN_BASE + 0x118)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_7_B0                        (AR_CHAN_BASE + 0x11c)
+#define AR_PHY_PAPRD_PRE_POST_SCALING                           0x3FFFF
+#define AR_PHY_PAPRD_PRE_POST_SCALING_S                         0
+
+#define AR_PHY_PAPRD_TRAINER_STAT1                              (AR_SM_BASE + 0x4a0)
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE             0x00000001
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE_S           0
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE       0x00000002
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE_S     1
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR               0x00000004
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR_S             2
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE           0x00000008
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE_S         3
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX            0x000001f0
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX_S          4
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR               0x0001fe00
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR_S             9
+
+#define AR_PHY_PAPRD_TRAINER_STAT2                              (AR_SM_BASE + 0x4a4)
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL               0x0000ffff
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL_S             0
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX             0x001f0000
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX_S           16
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX               0x00600000
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX_S             21
+
+#define AR_PHY_PAPRD_TRAINER_STAT3                              (AR_SM_BASE + 0x4a8)
+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT      0x000fffff
+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT_S    0
+
+#define AR_PHY_PAPRD_MEM_TAB_B0                 (AR_CHAN_BASE + 0x120)
+#define AR_PHY_PAPRD_MEM_TAB_B1                 (AR_CHAN1_BASE + 0x120)
+#define AR_PHY_PAPRD_MEM_TAB_B2                 (AR_CHAN2_BASE + 0x120)
+
+#define AR_PHY_PA_GAIN123_B0                    (AR_CHAN_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_B1                    (AR_CHAN1_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_B2                    (AR_CHAN2_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_PA_GAIN1              0x3FF
+#define AR_PHY_PA_GAIN123_PA_GAIN1_S            0
+
+#define AR_PHY_POWERTX_RATE5                    (AR_SM_BASE + 0x1d0)
+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0      0x3F
+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0_S    0
+
 void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
 
 #endif  /* AR9003_PHY_H */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 82aca4b6154c..8d163ae4255e 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/device.h>
 #include <linux/leds.h>
+#include <linux/completion.h>
 
 #include "debug.h"
 #include "common.h"
@@ -194,6 +195,7 @@ enum ATH_AGGR_STATUS {
 
 #define ATH_TXFIFO_DEPTH 8
 struct ath_txq {
+        int axq_class;
         u32 axq_qnum;
         u32 *axq_link;
         struct list_head axq_q;
@@ -206,7 +208,6 @@ struct ath_txq {
         struct list_head txq_fifo_pending;
         u8 txq_headidx;
         u8 txq_tailidx;
-        int pending_frames;
 };
 
 struct ath_atx_ac {
@@ -224,6 +225,7 @@ struct ath_buf_state {
         int bfs_tidno;
         int bfs_retries;
         u8 bf_type;
+        u8 bfs_paprd;
         u32 bfs_keyix;
         enum ath9k_key_type bfs_keytype;
 };
@@ -244,7 +246,6 @@ struct ath_buf {
         struct ath_buf_state bf_state;
         dma_addr_t bf_dmacontext;
         struct ath_wiphy *aphy;
-        struct ath_txq *txq;
 };
 
 struct ath_atx_tid {
@@ -281,6 +282,7 @@ struct ath_tx_control {
         struct ath_txq *txq;
         int if_id;
         enum ath9k_internal_frame_type frame_type;
+        u8 paprd;
 };
 
 #define ATH_TX_ERROR        0x01
@@ -290,11 +292,12 @@ struct ath_tx_control {
 struct ath_tx {
         u16 seq_no;
         u32 txqsetup;
-        int hwq_map[ATH9K_WME_AC_VO+1];
+        int hwq_map[WME_NUM_AC];
         spinlock_t txbuflock;
         struct list_head txbuf;
         struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
         struct ath_descdma txdma;
+        int pending_frames[WME_NUM_AC];
 };
 
 struct ath_rx_edma {
@@ -417,10 +420,12 @@ int ath_beaconq_config(struct ath_softc *sc);
 
 #define ATH_STA_SHORT_CALINTERVAL 1000    /* 1 second */
 #define ATH_AP_SHORT_CALINTERVAL  100     /* 100 ms */
-#define ATH_ANI_POLLINTERVAL      100     /* 100 ms */
+#define ATH_ANI_POLLINTERVAL_OLD  100     /* 100 ms */
+#define ATH_ANI_POLLINTERVAL_NEW  1000    /* 1000 ms */
 #define ATH_LONG_CALINTERVAL      30000   /* 30 seconds */
 #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
 
+void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 
 /**********/
@@ -552,6 +557,9 @@ struct ath_softc {
         spinlock_t sc_serial_rw;
         spinlock_t sc_pm_lock;
         struct mutex mutex;
+        struct work_struct paprd_work;
+        struct completion paprd_complete;
+        int paprd_txok;
 
         u32 intrstatus;
         u32 sc_flags; /* SC_OP_* */
@@ -610,7 +618,6 @@ struct ath_wiphy {
 
 void ath9k_tasklet(unsigned long data);
 int ath_reset(struct ath_softc *sc, bool retry_tx);
-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);
 int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
 int ath_cabq_update(struct ath_softc *);
 
@@ -626,8 +633,6 @@ irqreturn_t ath_isr(int irq, void *dev);
 int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                     const struct ath_bus_ops *bus_ops);
 void ath9k_deinit_device(struct ath_softc *sc);
-const char *ath_mac_bb_name(u32 mac_bb_version);
-const char *ath_rf_name(u16 rf_version);
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
 void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
                            struct ath9k_channel *ichan);
@@ -678,8 +683,6 @@ void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle);
 void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);
 void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
 
-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);
-
 void ath_start_rfkill_poll(struct ath_softc *sc);
 extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
 
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index f43d85a302c4..4d4b22d52dfd 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -38,8 +38,7 @@ int ath_beaconq_config(struct ath_softc *sc)
                 qi.tqi_cwmax = 0;
         } else {
                 /* Adhoc mode; important thing is to use 2x cwmin. */
-                qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA,
-                                       ATH9K_WME_AC_BE);
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 ath9k_hw_get_txq_props(ah, qnum, &qi_be);
                 qi.tqi_aifs = qi_be.tqi_aifs;
                 qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index a127bdba5f90..54aae931424e 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -630,10 +630,10 @@ static const struct file_operations fops_wiphy = {
         do {                                                            \
                 len += snprintf(buf + len, size - len,                  \
                                 "%s%13u%11u%10u%10u\n", str,            \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BE]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BK]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VI]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VO]].elem); \
 } while(0)
 
 static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
@@ -956,6 +956,10 @@ int ath9k_init_debug(struct ath_hw *ah)
                         sc->debug.debugfs_phy, sc, &fops_regval))
                 goto err;
 
+        if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
+                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
+                goto err;
+
         sc->debug.regidx = 0;
         return 0;
 err:
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index 7da7d73c0847..bdd8aa054b80 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -263,7 +263,8 @@ enum eeprom_param {
         EEP_PWR_TABLE_OFFSET,
         EEP_DRIVE_STRENGTH,
         EEP_INTERNAL_REGULATOR,
-        EEP_SWREG
+        EEP_SWREG,
+        EEP_PAPRD,
 };
 
 enum ar5416_rates {
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 051b8d89b9f2..58f52a1dc7ea 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -223,15 +223,6 @@ struct ath9k_htc_sta {
         enum tid_aggr_state tid_state[ATH9K_HTC_MAX_TID];
 };
 
-struct ath9k_htc_aggr_work {
-        u16 tid;
-        u8 sta_addr[ETH_ALEN];
-        struct ieee80211_hw *hw;
-        struct ieee80211_vif *vif;
-        enum ieee80211_ampdu_mlme_action action;
-        struct mutex mutex;
-};
-
 #define ATH9K_HTC_RXBUF 256
 #define HTC_RX_FRAME_HEADER_SIZE 40
 
@@ -331,11 +322,10 @@ struct htc_beacon_config {
 #define OP_LED_ON         BIT(4)
 #define OP_PREAMBLE_SHORT BIT(5)
 #define OP_PROTECT_ENABLE BIT(6)
-#define OP_TXAGGR         BIT(7)
-#define OP_ASSOCIATED     BIT(8)
-#define OP_ENABLE_BEACON  BIT(9)
-#define OP_LED_DEINIT     BIT(10)
-#define OP_UNPLUGGED      BIT(11)
+#define OP_ASSOCIATED     BIT(7)
+#define OP_ENABLE_BEACON  BIT(8)
+#define OP_LED_DEINIT     BIT(9)
+#define OP_UNPLUGGED      BIT(10)
 
 struct ath9k_htc_priv {
         struct device *dev;
@@ -376,8 +366,6 @@ struct ath9k_htc_priv {
         struct ath9k_htc_rx rx;
         struct tasklet_struct tx_tasklet;
         struct sk_buff_head tx_queue;
-        struct ath9k_htc_aggr_work aggr_work;
-        struct delayed_work ath9k_aggr_work;
         struct delayed_work ath9k_ani_work;
         struct work_struct ps_work;
 
@@ -398,7 +386,7 @@ struct ath9k_htc_priv {
 
         int beaconq;
         int cabq;
-        int hwq_map[ATH9K_WME_AC_VO+1];
+        int hwq_map[WME_NUM_AC];
 
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
         struct ath9k_debug debug;
@@ -431,8 +419,7 @@ int ath9k_tx_init(struct ath9k_htc_priv *priv);
 void ath9k_tx_tasklet(unsigned long data);
 int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb);
 void ath9k_tx_cleanup(struct ath9k_htc_priv *priv);
-bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
-                         enum ath9k_tx_queue_subtype qtype);
+bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype);
 int ath9k_htc_cabq_setup(struct ath9k_htc_priv *priv);
 int get_hw_qnum(u16 queue, int *hwq_map);
 int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum,
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 12a3bb0a9159..bd1506e69105 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -227,7 +227,7 @@ void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv)
 {
         struct ath_hw *ah = priv->ah;
         struct ath9k_tx_queue_info qi, qi_be;
-        int qnum = priv->hwq_map[ATH9K_WME_AC_BE];
+        int qnum = priv->hwq_map[WME_AC_BE];
 
         memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
         memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info));
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 7339439f0bef..a63ae88abf3e 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -521,23 +521,23 @@ static int ath9k_init_queues(struct ath9k_htc_priv *priv)
                 goto err;
         }
 
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BE traffic\n");
                 goto err;
         }
 
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BK)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BK traffic\n");
                 goto err;
         }
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VI)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VI traffic\n");
                 goto err;
         }
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VO)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VO traffic\n");
                 goto err;
@@ -569,36 +569,6 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
          */
         for (i = 0; i < common->keymax; i++)
                 ath9k_hw_keyreset(priv->ah, (u16) i);
-
-        if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)) {
-                /*
-                 * Whether we should enable h/w TKIP MIC.
-                 * XXX: if we don't support WME TKIP MIC, then we wouldn't
-                 * report WMM capable, so it's always safe to turn on
-                 * TKIP MIC in this case.
-                 */
-                ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-        }
-
-        /*
-         * Check whether the separate key cache entries
-         * are required to handle both tx+rx MIC keys.
-         * With split mic keys the number of stations is limited
-         * to 27 otherwise 59.
-         */
-        if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)
-            && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                      ATH9K_CIPHER_MIC, NULL)
-            && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT,
-                                      0, NULL))
-                common->splitmic = 1;
-
-        /* turn on mcast key search if possible */
-        if (!ath9k_hw_getcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))
-                (void)ath9k_hw_setcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH,
-                                             1, 1, NULL);
 }
 
 static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)
@@ -636,7 +606,6 @@ static void ath9k_init_misc(struct ath9k_htc_priv *priv)
         if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)
                 memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
 
-        priv->op_flags |= OP_TXAGGR;
         priv->ah->opmode = NL80211_IFTYPE_STATION;
 }
 
@@ -668,14 +637,12 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, u16 devid)
         spin_lock_init(&priv->beacon_lock);
         spin_lock_init(&priv->tx_lock);
         mutex_init(&priv->mutex);
-        mutex_init(&priv->aggr_work.mutex);
         mutex_init(&priv->htc_pm_lock);
         tasklet_init(&priv->wmi_tasklet, ath9k_wmi_tasklet,
                      (unsigned long)priv);
         tasklet_init(&priv->rx_tasklet, ath9k_rx_tasklet,
                      (unsigned long)priv);
         tasklet_init(&priv->tx_tasklet, ath9k_tx_tasklet, (unsigned long)priv);
-        INIT_DELAYED_WORK(&priv->ath9k_aggr_work, ath9k_htc_aggr_work);
         INIT_DELAYED_WORK(&priv->ath9k_ani_work, ath9k_ani_work);
         INIT_WORK(&priv->ps_work, ath9k_ps_work);
 
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 7aefbc638770..05445d8a9818 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -27,13 +27,11 @@ static struct dentry *ath9k_debugfs_root;
 static void ath_update_txpow(struct ath9k_htc_priv *priv)
 {
         struct ath_hw *ah = priv->ah;
-        u32 txpow;
 
         if (priv->curtxpow != priv->txpowlimit) {
                 ath9k_hw_set_txpowerlimit(ah, priv->txpowlimit);
                 /* read back in case value is clamped */
-                ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
-                priv->curtxpow = txpow;
+                priv->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
         }
 }
 
@@ -364,11 +362,8 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,
                 trate->rates.ht_rates.rs_nrates = j;
 
                 caps = WLAN_RC_HT_FLAG;
-                if (priv->ah->caps.tx_chainmask != 1 &&
-                    ath9k_hw_getcapability(priv->ah, ATH9K_CAP_DS, 0, NULL)) {
-                        if (sta->ht_cap.mcs.rx_mask[1])
-                                caps |= WLAN_RC_DS_FLAG;
-                }
+                if (sta->ht_cap.mcs.rx_mask[1])
+                        caps |= WLAN_RC_DS_FLAG;
                 if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
                         caps |= WLAN_RC_40_FLAG;
                 if (conf_is_ht40(&priv->hw->conf) &&
@@ -443,13 +438,13 @@ static void ath9k_htc_update_rate(struct ath9k_htc_priv *priv,
                           bss_conf->bssid, be32_to_cpu(trate.capflags));
 }
 
-static int ath9k_htc_aggr_oper(struct ath9k_htc_priv *priv,
-                               struct ieee80211_vif *vif,
-                               u8 *sta_addr, u8 tid, bool oper)
+int ath9k_htc_tx_aggr_oper(struct ath9k_htc_priv *priv,
+                           struct ieee80211_vif *vif,
+                           struct ieee80211_sta *sta,
+                           enum ieee80211_ampdu_mlme_action action, u16 tid)
 {
         struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ath9k_htc_target_aggr aggr;
-        struct ieee80211_sta *sta = NULL;
         struct ath9k_htc_sta *ista;
         int ret = 0;
         u8 cmd_rsp;
@@ -458,72 +453,28 @@ static int ath9k_htc_aggr_oper(struct ath9k_htc_priv *priv,
                 return -EINVAL;
 
         memset(&aggr, 0, sizeof(struct ath9k_htc_target_aggr));
-
-        rcu_read_lock();
-
-        /* Check if we are able to retrieve the station */
-        sta = ieee80211_find_sta(vif, sta_addr);
-        if (!sta) {
-                rcu_read_unlock();
-                return -EINVAL;
-        }
-
         ista = (struct ath9k_htc_sta *) sta->drv_priv;
 
-        if (oper)
-                ista->tid_state[tid] = AGGR_START;
-        else
-                ista->tid_state[tid] = AGGR_STOP;
-
         aggr.sta_index = ista->index;
-
-        rcu_read_unlock();
-
-        aggr.tidno = tid;
-        aggr.aggr_enable = oper;
+        aggr.tidno = tid & 0xf;
+        aggr.aggr_enable = (action == IEEE80211_AMPDU_TX_START) ? true : false;
 
         WMI_CMD_BUF(WMI_TX_AGGR_ENABLE_CMDID, &aggr);
         if (ret)
                 ath_print(common, ATH_DBG_CONFIG,
                           "Unable to %s TX aggregation for (%pM, %d)\n",
-                          (oper) ? "start" : "stop", sta->addr, tid);
+                          (aggr.aggr_enable) ? "start" : "stop", sta->addr, tid);
         else
                 ath_print(common, ATH_DBG_CONFIG,
-                          "%s aggregation for (%pM, %d)\n",
-                          (oper) ? "Starting" : "Stopping", sta->addr, tid);
-
-        return ret;
-}
-
-void ath9k_htc_aggr_work(struct work_struct *work)
-{
-        int ret = 0;
-        struct ath9k_htc_priv *priv =
-                container_of(work, struct ath9k_htc_priv,
-                             ath9k_aggr_work.work);
-        struct ath9k_htc_aggr_work *wk = &priv->aggr_work;
-
-        mutex_lock(&wk->mutex);
+                          "%s TX aggregation for (%pM, %d)\n",
+                          (aggr.aggr_enable) ? "Starting" : "Stopping",
+                          sta->addr, tid);
 
-        switch (wk->action) {
-        case IEEE80211_AMPDU_TX_START:
-                ret = ath9k_htc_aggr_oper(priv, wk->vif, wk->sta_addr,
-                                          wk->tid, true);
-                if (!ret)
-                        ieee80211_start_tx_ba_cb(wk->vif, wk->sta_addr,
-                                                 wk->tid);
-                break;
-        case IEEE80211_AMPDU_TX_STOP:
-                ath9k_htc_aggr_oper(priv, wk->vif, wk->sta_addr,
-                                    wk->tid, false);
-                ieee80211_stop_tx_ba_cb(wk->vif, wk->sta_addr, wk->tid);
-                break;
-        default:
-                ath_print(ath9k_hw_common(priv->ah), ATH_DBG_FATAL,
-                          "Unknown AMPDU action\n");
-        }
+        spin_lock_bh(&priv->tx_lock);
+        ista->tid_state[tid] = (aggr.aggr_enable && !ret) ? AGGR_START : AGGR_STOP;
+        spin_unlock_bh(&priv->tx_lock);
 
-        mutex_unlock(&wk->mutex);
+        return ret;
 }
 
 /*********/
@@ -1271,7 +1222,6 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
         /* Cancel all the running timers/work .. */
         cancel_work_sync(&priv->ps_work);
         cancel_delayed_work_sync(&priv->ath9k_ani_work);
-        cancel_delayed_work_sync(&priv->ath9k_aggr_work);
         cancel_delayed_work_sync(&priv->ath9k_led_blink_work);
         ath9k_led_stop_brightness(priv);
 
@@ -1590,7 +1540,7 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
         }
 
         if ((priv->ah->opmode == NL80211_IFTYPE_ADHOC) &&
-            (qnum == priv->hwq_map[ATH9K_WME_AC_BE]))
+            (qnum == priv->hwq_map[WME_AC_BE]))
                     ath9k_htc_beaconq_config(priv);
 out:
         ath9k_htc_ps_restore(priv);
@@ -1772,8 +1722,8 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
                                   u16 tid, u16 *ssn)
 {
         struct ath9k_htc_priv *priv = hw->priv;
-        struct ath9k_htc_aggr_work *work = &priv->aggr_work;
         struct ath9k_htc_sta *ista;
+        int ret = 0;
 
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
@@ -1781,26 +1731,26 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_RX_STOP:
                 break;
         case IEEE80211_AMPDU_TX_START:
+                ret = ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);
+                if (!ret)
+                        ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                break;
         case IEEE80211_AMPDU_TX_STOP:
-                if (!(priv->op_flags & OP_TXAGGR))
-                        return -ENOTSUPP;
-                memcpy(work->sta_addr, sta->addr, ETH_ALEN);
-                work->hw = hw;
-                work->vif = vif;
-                work->action = action;
-                work->tid = tid;
-                ieee80211_queue_delayed_work(hw, &priv->ath9k_aggr_work, 0);
+                ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);
+                ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 ista = (struct ath9k_htc_sta *) sta->drv_priv;
+                spin_lock_bh(&priv->tx_lock);
                 ista->tid_state[tid] = AGGR_OPERATIONAL;
+                spin_unlock_bh(&priv->tx_lock);
                 break;
         default:
                 ath_print(ath9k_hw_common(priv->ah), ATH_DBG_FATAL,
                           "Unknown AMPDU action\n");
         }
 
-        return 0;
+        return ret;
 }
 
 static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index f0cca4e36f7d..bd0b4acc3ece 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -34,15 +34,15 @@ int get_hw_qnum(u16 queue, int *hwq_map)
 {
         switch (queue) {
         case 0:
-                return hwq_map[ATH9K_WME_AC_VO];
+                return hwq_map[WME_AC_VO];
         case 1:
-                return hwq_map[ATH9K_WME_AC_VI];
+                return hwq_map[WME_AC_VI];
         case 2:
-                return hwq_map[ATH9K_WME_AC_BE];
+                return hwq_map[WME_AC_BE];
         case 3:
-                return hwq_map[ATH9K_WME_AC_BK];
+                return hwq_map[WME_AC_BK];
         default:
-                return hwq_map[ATH9K_WME_AC_BE];
+                return hwq_map[WME_AC_BE];
         }
 }
 
@@ -187,6 +187,19 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
         return htc_send(priv->htc, skb, epid, &tx_ctl);
 }
 
+static bool ath9k_htc_check_tx_aggr(struct ath9k_htc_priv *priv,
+                                    struct ath9k_htc_sta *ista, u8 tid)
+{
+        bool ret = false;
+
+        spin_lock_bh(&priv->tx_lock);
+        if ((tid < ATH9K_HTC_MAX_TID) && (ista->tid_state[tid] == AGGR_STOP))
+                ret = true;
+        spin_unlock_bh(&priv->tx_lock);
+
+        return ret;
+}
+
 void ath9k_tx_tasklet(unsigned long data)
 {
         struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;
@@ -216,8 +229,7 @@ void ath9k_tx_tasklet(unsigned long data)
                 /* Check if we need to start aggregation */
 
                 if (sta && conf_is_ht(&priv->hw->conf) &&
-                    (priv->op_flags & OP_TXAGGR)
-                    && !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
+                    !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
                         if (ieee80211_is_data_qos(fc)) {
                                 u8 *qc, tid;
                                 struct ath9k_htc_sta *ista;
@@ -226,10 +238,11 @@ void ath9k_tx_tasklet(unsigned long data)
                                 tid = qc[0] & 0xf;
                                 ista = (struct ath9k_htc_sta *)sta->drv_priv;
 
-                                if ((tid < ATH9K_HTC_MAX_TID) &&
-                                    ista->tid_state[tid] == AGGR_STOP) {
+                                if (ath9k_htc_check_tx_aggr(priv, ista, tid)) {
                                         ieee80211_start_tx_ba_session(sta, tid);
+                                        spin_lock_bh(&priv->tx_lock);
                                         ista->tid_state[tid] = AGGR_PROGRESS;
+                                        spin_unlock_bh(&priv->tx_lock);
                                 }
                         }
                 }
@@ -297,8 +310,7 @@ void ath9k_tx_cleanup(struct ath9k_htc_priv *priv)
 
 }
 
-bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
-                         enum ath9k_tx_queue_subtype subtype)
+bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype)
 {
         struct ath_hw *ah = priv->ah;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -404,9 +416,6 @@ static void ath9k_htc_opmode_init(struct ath9k_htc_priv *priv)
         /* configure operational mode */
         ath9k_hw_setopmode(ah);
 
-        /* Handle any link-level address change. */
-        ath9k_hw_setmac(ah, common->macaddr);
-
         /* calculate and install multicast filter */
         mfilt[0] = mfilt[1] = ~0;
         ath9k_hw_setmcastfilter(ah, mfilt[0], mfilt[1]);
@@ -416,7 +425,7 @@ void ath9k_host_rx_init(struct ath9k_htc_priv *priv)
 {
         ath9k_hw_rxena(priv->ah);
         ath9k_htc_opmode_init(priv);
-        ath9k_hw_startpcureceive(priv->ah);
+        ath9k_hw_startpcureceive(priv->ah, (priv->op_flags & OP_SCANNING));
         priv->rx.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 624422a8169e..381da6c93b14 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -128,6 +128,17 @@ static inline void ath9k_hw_set11n_virtualmorefrag(struct ath_hw *ah, void *ds,
         ath9k_hw_ops(ah)->set11n_virtualmorefrag(ah, ds, vmf);
 }
 
+static inline void ath9k_hw_procmibevent(struct ath_hw *ah)
+{
+        ath9k_hw_ops(ah)->ani_proc_mib_event(ah);
+}
+
+static inline void ath9k_hw_ani_monitor(struct ath_hw *ah,
+                                        struct ath9k_channel *chan)
+{
+        ath9k_hw_ops(ah)->ani_monitor(ah, chan);
+}
+
 /* Private hardware call ops */
 
 /* PHY ops */
@@ -277,4 +288,9 @@ static inline bool ath9k_hw_iscal_supported(struct ath_hw *ah,
         return ath9k_hw_private_ops(ah)->iscal_supported(ah, calType);
 }
 
+static inline void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
+{
+        ath9k_hw_private_ops(ah)->ani_reset(ah, is_scanning);
+}
+
 #endif /* ATH9K_HW_OPS_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 2adc7e78cebf..62597f4ca319 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -23,11 +23,6 @@
 #include "rc.h"
 #include "ar9003_mac.h"
 
-#define ATH9K_CLOCK_RATE_CCK            22
-#define ATH9K_CLOCK_RATE_5GHZ_OFDM      40
-#define ATH9K_CLOCK_RATE_2GHZ_OFDM      44
-#define ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM 44
-
 static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type);
 
 MODULE_AUTHOR("Atheros Communications");
@@ -80,6 +75,15 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah)
         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 */
 /********************/
@@ -371,13 +375,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
         ah->config.ofdm_trig_high = 500;
         ah->config.cck_trig_high = 200;
         ah->config.cck_trig_low = 100;
-
-        /*
-         * For now ANI is disabled for AR9003, it is still
-         * being tested.
-         */
-        if (!AR_SREV_9300_20_OR_LATER(ah))
-                ah->config.enable_ani = 1;
+        ah->config.enable_ani = true;
 
         for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
                 ah->config.spurchans[i][0] = AR_NO_SPUR;
@@ -427,7 +425,9 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
                 ah->ah_flags = AH_USE_EEPROM;
 
         ah->atim_window = 0;
-        ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
+        ah->sta_id1_defaults =
+                AR_STA_ID1_CRPT_MIC_ENABLE |
+                AR_STA_ID1_MCAST_KSRCH;
         ah->beacon_interval = 100;
         ah->enable_32kHz_clock = DONT_USE_32KHZ;
         ah->slottime = (u32) -1;
@@ -565,6 +565,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         ah->ani_function = ATH9K_ANI_ALL;
         if (AR_SREV_9280_10_OR_LATER(ah) && !AR_SREV_9300_20_OR_LATER(ah))
                 ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
 
         ath9k_hw_init_mode_regs(ah);
 
@@ -1365,6 +1367,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 ath9k_hw_resettxqueue(ah, i);
 
         ath9k_hw_init_interrupt_masks(ah, ah->opmode);
+        ath9k_hw_ani_cache_ini_regs(ah);
         ath9k_hw_init_qos(ah);
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
@@ -2234,6 +2237,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->rx_status_len = sizeof(struct ar9003_rxs);
                 pCap->tx_desc_len = sizeof(struct ar9003_txc);
                 pCap->txs_len = sizeof(struct ar9003_txs);
+                if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
+                        pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
         } else {
                 pCap->tx_desc_len = sizeof(struct ath_desc);
                 if (AR_SREV_9280_20(ah) &&
@@ -2252,98 +2257,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
         return 0;
 }
 
-bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 *result)
-{
-        struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
-        switch (type) {
-        case ATH9K_CAP_CIPHER:
-                switch (capability) {
-                case ATH9K_CIPHER_AES_CCM:
-                case ATH9K_CIPHER_AES_OCB:
-                case ATH9K_CIPHER_TKIP:
-                case ATH9K_CIPHER_WEP:
-                case ATH9K_CIPHER_MIC:
-                case ATH9K_CIPHER_CLR:
-                        return true;
-                default:
-                        return false;
-                }
-        case ATH9K_CAP_TKIP_MIC:
-                switch (capability) {
-                case 0:
-                        return true;
-                case 1:
-                        return (ah->sta_id1_defaults &
-                                AR_STA_ID1_CRPT_MIC_ENABLE) ? true :
-                        false;
-                }
-        case ATH9K_CAP_TKIP_SPLIT:
-                return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?
-                        false : true;
-        case ATH9K_CAP_MCAST_KEYSRCH:
-                switch (capability) {
-                case 0:
-                        return true;
-                case 1:
-                        if (REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_ADHOC) {
-                                return false;
-                        } else {
-                                return (ah->sta_id1_defaults &
-                                        AR_STA_ID1_MCAST_KSRCH) ? true :
-                                        false;
-                        }
-                }
-                return false;
-        case ATH9K_CAP_TXPOW:
-                switch (capability) {
-                case 0:
-                        return 0;
-                case 1:
-                        *result = regulatory->power_limit;
-                        return 0;
-                case 2:
-                        *result = regulatory->max_power_level;
-                        return 0;
-                case 3:
-                        *result = regulatory->tp_scale;
-                        return 0;
-                }
-                return false;
-        case ATH9K_CAP_DS:
-                return (AR_SREV_9280_20_OR_LATER(ah) &&
-                        (ah->eep_ops->get_eeprom(ah, EEP_RC_CHAIN_MASK) == 1))
-                        ? false : true;
-        default:
-                return false;
-        }
-}
-EXPORT_SYMBOL(ath9k_hw_getcapability);
-
-bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 setting, int *status)
-{
-        switch (type) {
-        case ATH9K_CAP_TKIP_MIC:
-                if (setting)
-                        ah->sta_id1_defaults |=
-                                AR_STA_ID1_CRPT_MIC_ENABLE;
-                else
-                        ah->sta_id1_defaults &=
-                                ~AR_STA_ID1_CRPT_MIC_ENABLE;
-                return true;
-        case ATH9K_CAP_MCAST_KEYSRCH:
-                if (setting)
-                        ah->sta_id1_defaults |= AR_STA_ID1_MCAST_KSRCH;
-                else
-                        ah->sta_id1_defaults &= ~AR_STA_ID1_MCAST_KSRCH;
-                return true;
-        default:
-                return false;
-        }
-}
-EXPORT_SYMBOL(ath9k_hw_setcapability);
-
 /****************************/
 /* GPIO / RFKILL / Antennae */
 /****************************/
@@ -2537,12 +2450,6 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit)
 }
 EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit);
 
-void ath9k_hw_setmac(struct ath_hw *ah, const u8 *mac)
-{
-        memcpy(ath9k_hw_common(ah)->macaddr, mac, ETH_ALEN);
-}
-EXPORT_SYMBOL(ath9k_hw_setmac);
-
 void ath9k_hw_setopmode(struct ath_hw *ah)
 {
         ath9k_hw_set_operating_mode(ah, ah->opmode);
@@ -2615,21 +2522,6 @@ void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting)
 }
 EXPORT_SYMBOL(ath9k_hw_set_tsfadjust);
 
-/*
- *  Extend 15-bit time stamp from rx descriptor to
- *  a full 64-bit TSF using the current h/w TSF.
-*/
-u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp)
-{
-        u64 tsf;
-
-        tsf = ath9k_hw_gettsf64(ah);
-        if ((tsf & 0x7fff) < rstamp)
-                tsf -= 0x8000;
-        return (tsf & ~0x7fff) | rstamp;
-}
-EXPORT_SYMBOL(ath9k_hw_extend_tsf);
-
 void ath9k_hw_set11nmac2040(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 88bf2fca3736..5ecbfcf7470a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -158,6 +158,9 @@
 #define ATH9K_HW_RX_HP_QDEPTH   16
 #define ATH9K_HW_RX_LP_QDEPTH   128
 
+#define PAPRD_GAIN_TABLE_ENTRIES    32
+#define PAPRD_TABLE_SZ              24
+
 enum ath_ini_subsys {
         ATH_INI_PRE = 0,
         ATH_INI_CORE,
@@ -200,15 +203,7 @@ enum ath9k_hw_caps {
         ATH9K_HW_CAP_LDPC                       = BIT(19),
         ATH9K_HW_CAP_FASTCLOCK                  = BIT(20),
         ATH9K_HW_CAP_SGI_20                     = BIT(21),
-};
-
-enum ath9k_capability_type {
-        ATH9K_CAP_CIPHER = 0,
-        ATH9K_CAP_TKIP_MIC,
-        ATH9K_CAP_TKIP_SPLIT,
-        ATH9K_CAP_TXPOW,
-        ATH9K_CAP_MCAST_KEYSRCH,
-        ATH9K_CAP_DS
+        ATH9K_HW_CAP_PAPRD                      = BIT(22),
 };
 
 struct ath9k_hw_capabilities {
@@ -238,7 +233,7 @@ struct ath9k_ops_config {
         int sw_beacon_response_time;
         int additional_swba_backoff;
         int ack_6mb;
-        int cwm_ignore_extcca;
+        u32 cwm_ignore_extcca;
         u8 pcie_powersave_enable;
         u8 pcie_clock_req;
         u32 pcie_waen;
@@ -266,6 +261,7 @@ struct ath9k_ops_config {
         int spurmode;
         u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
         u8 max_txtrig_level;
+        u16 ani_poll_interval; /* ANI poll interval in ms */
 };
 
 enum ath9k_int {
@@ -359,6 +355,9 @@ struct ath9k_channel {
         int8_t iCoff;
         int8_t qCoff;
         int16_t rawNoiseFloor;
+        bool paprd_done;
+        u16 small_signal_gain[AR9300_MAX_CHAINS];
+        u32 pa_table[AR9300_MAX_CHAINS][PAPRD_TABLE_SZ];
 };
 
 #define IS_CHAN_G(_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
@@ -511,6 +510,17 @@ struct ath_gen_timer_table {
  * @setup_calibration: set up calibration
  * @iscal_supported: used to query if a type of calibration is supported
  * @loadnf: load noise floor read from each chain on the CCA registers
+ *
+ * @ani_reset: reset ANI parameters to default values
+ * @ani_lower_immunity: lower the noise immunity level. The level controls
+ *      the power-based packet detection on hardware. If a power jump is
+ *      detected the adapter takes it as an indication that a packet has
+ *      arrived. The level ranges from 0-5. Each level corresponds to a
+ *      few dB more of noise immunity. If you have a strong time-varying
+ *      interference that is causing false detections (OFDM timing errors or
+ *      CCK timing errors) the level can be increased.
+ * @ani_cache_ini_regs: cache the values for ANI from the initial
+ *      register settings through the register initialization.
  */
 struct ath_hw_private_ops {
         /* Calibration ops */
@@ -554,6 +564,11 @@ struct ath_hw_private_ops {
                             int param);
         void (*do_getnf)(struct ath_hw *ah, int16_t nfarray[NUM_NF_READINGS]);
         void (*loadnf)(struct ath_hw *ah, struct ath9k_channel *chan);
+
+        /* ANI */
+        void (*ani_reset)(struct ath_hw *ah, bool is_scanning);
+        void (*ani_lower_immunity)(struct ath_hw *ah);
+        void (*ani_cache_ini_regs)(struct ath_hw *ah);
 };
 
 /**
@@ -564,6 +579,11 @@ struct ath_hw_private_ops {
  *
  * @config_pci_powersave:
  * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
+ *
+ * @ani_proc_mib_event: process MIB events, this would happen upon specific ANI
+ *      thresholds being reached or having overflowed.
+ * @ani_monitor: called periodically by the core driver to collect
+ *      MIB stats and adjust ANI if specific thresholds have been reached.
  */
 struct ath_hw_ops {
         void (*config_pci_powersave)(struct ath_hw *ah,
@@ -604,6 +624,9 @@ struct ath_hw_ops {
                                      u32 burstDuration);
         void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
                                        u32 vmf);
+
+        void (*ani_proc_mib_event)(struct ath_hw *ah);
+        void (*ani_monitor)(struct ath_hw *ah, struct ath9k_channel *chan);
 };
 
 struct ath_hw {
@@ -793,6 +816,9 @@ struct ath_hw {
 
         u32 bb_watchdog_last_status;
         u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */
+
+        u32 paprd_gain_table_entries[PAPRD_GAIN_TABLE_ENTRIES];
+        u8 paprd_gain_table_index[PAPRD_GAIN_TABLE_ENTRIES];
 };
 
 static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
@@ -822,10 +848,6 @@ int ath9k_hw_init(struct ath_hw *ah);
 int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                    bool bChannelChange);
 int ath9k_hw_fill_cap_info(struct ath_hw *ah);
-bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 *result);
-bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 setting, int *status);
 u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan);
 
 /* Key Cache Management */
@@ -860,7 +882,6 @@ void ath9k_hw_setrxfilter(struct ath_hw *ah, u32 bits);
 bool ath9k_hw_phy_disable(struct ath_hw *ah);
 bool ath9k_hw_disable(struct ath_hw *ah);
 void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit);
-void ath9k_hw_setmac(struct ath_hw *ah, const u8 *mac);
 void ath9k_hw_setopmode(struct ath_hw *ah);
 void ath9k_hw_setmcastfilter(struct ath_hw *ah, u32 filter0, u32 filter1);
 void ath9k_hw_setbssidmask(struct ath_hw *ah);
@@ -869,7 +890,6 @@ u64 ath9k_hw_gettsf64(struct ath_hw *ah);
 void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
 void ath9k_hw_reset_tsf(struct ath_hw *ah);
 void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);
-u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp);
 void ath9k_hw_init_global_settings(struct ath_hw *ah);
 void ath9k_hw_set11nmac2040(struct ath_hw *ah);
 void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
@@ -922,6 +942,15 @@ void ar9003_hw_set_nf_limits(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);
+void ar9003_paprd_enable(struct ath_hw *ah, bool val);
+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
+                                        struct ath9k_channel *chan, int chain);
+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
+                              int chain);
+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
+int ar9003_paprd_init_table(struct ath_hw *ah);
+bool ar9003_paprd_is_done(struct ath_hw *ah);
+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains);
 
 /* Hardware family op attach helpers */
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
@@ -934,8 +963,24 @@ void ar9003_hw_attach_calib_ops(struct ath_hw *ah);
 void ar9002_hw_attach_ops(struct ath_hw *ah);
 void ar9003_hw_attach_ops(struct ath_hw *ah);
 
+/*
+ * ANI work can be shared between all families but a next
+ * generation implementation of ANI will be used only for AR9003 only
+ * for now as the other families still need to be tested with the same
+ * next generation ANI. Feel free to start testing it though for the
+ * older families (AR5008, AR9001, AR9002) by using modparam_force_new_ani.
+ */
+extern int modparam_force_new_ani;
+void ath9k_hw_attach_ani_ops_old(struct ath_hw *ah);
+void ath9k_hw_attach_ani_ops_new(struct ath_hw *ah);
+
 #define ATH_PCIE_CAP_LINK_CTRL  0x70
 #define ATH_PCIE_CAP_LINK_L0S   1
 #define ATH_PCIE_CAP_LINK_L1    2
 
+#define ATH9K_CLOCK_RATE_CCK            22
+#define ATH9K_CLOCK_RATE_5GHZ_OFDM      40
+#define ATH9K_CLOCK_RATE_2GHZ_OFDM      44
+#define ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM 44
+
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 18d76ede859d..514a4014c198 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -379,36 +379,14 @@ static void ath9k_init_crypto(struct ath_softc *sc)
         for (i = 0; i < common->keymax; i++)
                 ath9k_hw_keyreset(sc->sc_ah, (u16) i);
 
-        if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)) {
-                /*
-                 * Whether we should enable h/w TKIP MIC.
-                 * XXX: if we don't support WME TKIP MIC, then we wouldn't
-                 * report WMM capable, so it's always safe to turn on
-                 * TKIP MIC in this case.
-                 */
-                ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-        }
-
         /*
          * Check whether the separate key cache entries
          * are required to handle both tx+rx MIC keys.
          * With split mic keys the number of stations is limited
          * to 27 otherwise 59.
          */
-        if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)
-            && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                      ATH9K_CIPHER_MIC, NULL)
-            && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT,
-                                      0, NULL))
+        if (!(sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA))
                 common->splitmic = 1;
-
-        /* turn on mcast key search if possible */
-        if (!ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))
-                (void)ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_MCAST_KEYSRCH,
-                                             1, 1, NULL);
-
 }
 
 static int ath9k_init_btcoex(struct ath_softc *sc)
@@ -426,7 +404,7 @@ static int ath9k_init_btcoex(struct ath_softc *sc)
                 r = ath_init_btcoex_timer(sc);
                 if (r)
                         return -1;
-                qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
                 break;
@@ -463,23 +441,23 @@ static int ath9k_init_queues(struct ath_softc *sc)
         sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
         ath_cabq_update(sc);
 
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {
+        if (!ath_tx_setup(sc, WME_AC_BK)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BK traffic\n");
                 goto err;
         }
 
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {
+        if (!ath_tx_setup(sc, WME_AC_BE)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BE traffic\n");
                 goto err;
         }
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {
+        if (!ath_tx_setup(sc, WME_AC_VI)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VI traffic\n");
                 goto err;
         }
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {
+        if (!ath_tx_setup(sc, WME_AC_VO)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VO traffic\n");
                 goto err;
@@ -736,6 +714,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                         goto error_world;
         }
 
+        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
         INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
         INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
         sc->wiphy_scheduler_int = msecs_to_jiffies(500);
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 0e425cb4bbb1..e955bb9d98cb 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -15,6 +15,7 @@
  */
 
 #include "hw.h"
+#include "hw-ops.h"
 
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
                                         struct ath9k_tx_queue_info *qi)
@@ -554,8 +555,13 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
                 REGWRITE_BUFFER_FLUSH(ah);
                 DISABLE_REGWRITE_BUFFER(ah);
 
-                /* cwmin and cwmax should be 0 for beacon queue */
-                if (AR_SREV_9300_20_OR_LATER(ah)) {
+                /*
+                 * cwmin and cwmax should be 0 for beacon queue
+                 * but not for IBSS as we would create an imbalance
+                 * on beaconing fairness for participating nodes.
+                 */
+                if (AR_SREV_9300_20_OR_LATER(ah) &&
+                    ah->opmode != NL80211_IFTYPE_ADHOC) {
                         REG_WRITE(ah, AR_DLCL_IFS(q), SM(0, AR_D_LCL_IFS_CWMIN)
                                   | SM(0, AR_D_LCL_IFS_CWMAX)
                                   | SM(qi->tqi_aifs, AR_D_LCL_IFS_AIFS));
@@ -756,11 +762,11 @@ void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp)
 }
 EXPORT_SYMBOL(ath9k_hw_putrxbuf);
 
-void ath9k_hw_startpcureceive(struct ath_hw *ah)
+void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning)
 {
         ath9k_enable_mib_counters(ah);
 
-        ath9k_ani_reset(ah);
+        ath9k_ani_reset(ah, is_scanning);
 
         REG_CLR_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
 }
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 00f3e0c7528a..7559fb2b28a5 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -577,13 +577,8 @@ enum ath9k_tx_queue {
 
 #define ATH9K_NUM_TX_QUEUES 10
 
-enum ath9k_tx_queue_subtype {
-        ATH9K_WME_AC_BK = 0,
-        ATH9K_WME_AC_BE,
-        ATH9K_WME_AC_VI,
-        ATH9K_WME_AC_VO,
-        ATH9K_WME_UPSD
-};
+/* Used as a queue subtype instead of a WMM AC */
+#define ATH9K_WME_UPSD  4
 
 enum ath9k_tx_queue_flags {
         TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
@@ -617,7 +612,7 @@ enum ath9k_pkt_type {
 struct ath9k_tx_queue_info {
         u32 tqi_ver;
         enum ath9k_tx_queue tqi_type;
-        enum ath9k_tx_queue_subtype tqi_subtype;
+        int tqi_subtype;
         enum ath9k_tx_queue_flags tqi_qflags;
         u32 tqi_priority;
         u32 tqi_aifs;
@@ -715,7 +710,7 @@ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
                           u32 size, u32 flags);
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);
 void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
-void ath9k_hw_startpcureceive(struct ath_hw *ah);
+void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
 void ath9k_hw_stoppcurecv(struct ath_hw *ah);
 void ath9k_hw_abortpcurecv(struct ath_hw *ah);
 bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index b8b76dd2c11e..c8de50fa6378 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -51,13 +51,11 @@ static void ath_cache_conf_rate(struct ath_softc *sc,
 static void ath_update_txpow(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
-        u32 txpow;
 
         if (sc->curtxpow != sc->config.txpowlimit) {
                 ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit);
                 /* read back in case value is clamped */
-                ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
-                sc->curtxpow = txpow;
+                sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
         }
 }
 
@@ -232,6 +230,113 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
         return r;
 }
 
+static void ath_paprd_activate(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        int chain;
+
+        if (!ah->curchan->paprd_done)
+                return;
+
+        ath9k_ps_wakeup(sc);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->caps.tx_chainmask & BIT(chain)))
+                        continue;
+
+                ar9003_paprd_populate_single_table(ah, ah->curchan, chain);
+        }
+
+        ar9003_paprd_enable(ah, true);
+        ath9k_ps_restore(sc);
+}
+
+void ath_paprd_calibrate(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
+        struct ieee80211_hw *hw = sc->hw;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ieee80211_hdr *hdr;
+        struct sk_buff *skb = NULL;
+        struct ieee80211_tx_info *tx_info;
+        int band = hw->conf.channel->band;
+        struct ieee80211_supported_band *sband = &sc->sbands[band];
+        struct ath_tx_control txctl;
+        int qnum, ftype;
+        int chain_ok = 0;
+        int chain;
+        int len = 1800;
+        int time_left;
+        int i;
+
+        ath9k_ps_wakeup(sc);
+        skb = alloc_skb(len, GFP_KERNEL);
+        if (!skb)
+                return;
+
+        tx_info = IEEE80211_SKB_CB(skb);
+
+        skb_put(skb, len);
+        memset(skb->data, 0, len);
+        hdr = (struct ieee80211_hdr *)skb->data;
+        ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
+        hdr->frame_control = cpu_to_le16(ftype);
+        hdr->duration_id = 10;
+        memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
+
+        memset(&txctl, 0, sizeof(txctl));
+        qnum = sc->tx.hwq_map[WME_AC_BE];
+        txctl.txq = &sc->tx.txq[qnum];
+
+        ar9003_paprd_init_table(ah);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->caps.tx_chainmask & BIT(chain)))
+                        continue;
+
+                chain_ok = 0;
+                memset(tx_info, 0, sizeof(*tx_info));
+                tx_info->band = band;
+
+                for (i = 0; i < 4; i++) {
+                        tx_info->control.rates[i].idx = sband->n_bitrates - 1;
+                        tx_info->control.rates[i].count = 6;
+                }
+
+                init_completion(&sc->paprd_complete);
+                ar9003_paprd_setup_gain_table(ah, chain);
+                txctl.paprd = BIT(chain);
+                if (ath_tx_start(hw, skb, &txctl) != 0)
+                        break;
+
+                time_left = wait_for_completion_timeout(&sc->paprd_complete,
+                                                        100);
+                if (!time_left) {
+                        ath_print(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
+                                  "Timeout waiting for paprd training on "
+                                  "TX chain %d\n",
+                                  chain);
+                        break;
+                }
+
+                if (!ar9003_paprd_is_done(ah))
+                        break;
+
+                if (ar9003_paprd_create_curve(ah, ah->curchan, chain) != 0)
+                        break;
+
+                chain_ok = 1;
+        }
+        kfree_skb(skb);
+
+        if (chain_ok) {
+                ah->curchan->paprd_done = true;
+                ath_paprd_activate(sc);
+        }
+
+        ath9k_ps_restore(sc);
+}
+
 /*
  *  This routine performs the periodic noise floor calibration function
  *  that is used to adjust and optimize the chip performance.  This
@@ -285,7 +390,8 @@ void ath_ani_calibrate(unsigned long data)
         }
 
         /* Verify whether we must check ANI */
-        if ((timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
+        if ((timestamp - common->ani.checkani_timer) >=
+             ah->config.ani_poll_interval) {
                 aniflag = true;
                 common->ani.checkani_timer = timestamp;
         }
@@ -326,15 +432,24 @@ set_timer:
         */
         cal_interval = ATH_LONG_CALINTERVAL;
         if (sc->sc_ah->config.enable_ani)
-                cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);
+                cal_interval = min(cal_interval,
+                                   (u32)ah->config.ani_poll_interval);
         if (!common->ani.caldone)
                 cal_interval = min(cal_interval, (u32)short_cal_interval);
 
         mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
+        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) &&
+            !(sc->sc_flags & SC_OP_SCANNING)) {
+                if (!sc->sc_ah->curchan->paprd_done)
+                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
+                else
+                        ath_paprd_activate(sc);
+        }
 }
 
 static void ath_start_ani(struct ath_common *common)
 {
+        struct ath_hw *ah = common->ah;
         unsigned long timestamp = jiffies_to_msecs(jiffies);
 
         common->ani.longcal_timer = timestamp;
@@ -342,7 +457,8 @@ static void ath_start_ani(struct ath_common *common)
         common->ani.checkani_timer = timestamp;
 
         mod_timer(&common->ani.timer,
-                  jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
+                  jiffies +
+                        msecs_to_jiffies((u32)ah->config.ani_poll_interval));
 }
 
 /*
@@ -804,25 +920,25 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
         return r;
 }
 
-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
+static int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
 {
         int qnum;
 
         switch (queue) {
         case 0:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];
+                qnum = sc->tx.hwq_map[WME_AC_VO];
                 break;
         case 1:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];
+                qnum = sc->tx.hwq_map[WME_AC_VI];
                 break;
         case 2:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 break;
         case 3:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];
+                qnum = sc->tx.hwq_map[WME_AC_BK];
                 break;
         default:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 break;
         }
 
@@ -834,16 +950,16 @@ int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc)
         int qnum;
 
         switch (queue) {
-        case ATH9K_WME_AC_VO:
+        case WME_AC_VO:
                 qnum = 0;
                 break;
-        case ATH9K_WME_AC_VI:
+        case WME_AC_VI:
                 qnum = 1;
                 break;
-        case ATH9K_WME_AC_BE:
+        case WME_AC_BE:
                 qnum = 2;
                 break;
-        case ATH9K_WME_AC_BK:
+        case WME_AC_BK:
                 qnum = 3;
                 break;
         default:
@@ -1127,6 +1243,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         cancel_delayed_work_sync(&sc->ath_led_blink_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
+        cancel_work_sync(&sc->paprd_work);
 
         if (!sc->num_sec_wiphy) {
                 cancel_delayed_work_sync(&sc->wiphy_work);
@@ -1555,7 +1672,7 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
                 ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n");
 
         if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
-                if ((qnum == sc->tx.hwq_map[ATH9K_WME_AC_BE]) && !ret)
+                if ((qnum == sc->tx.hwq_map[WME_AC_BE]) && !ret)
                         ath_beaconq_config(sc);
 
         mutex_unlock(&sc->mutex);
@@ -1769,6 +1886,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
         struct ath_softc *sc = aphy->sc;
         int ret = 0;
 
+        local_bh_disable();
+
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
                 if (!(sc->sc_flags & SC_OP_RXAGGR))
@@ -1798,6 +1917,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                           "Unknown AMPDU action\n");
         }
 
+        local_bh_enable();
+
         return ret;
 }
 
@@ -1842,6 +1963,7 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
         ath9k_wiphy_pause_all_forced(sc, aphy);
         sc->sc_flags |= SC_OP_SCANNING;
         del_timer_sync(&common->ani.timer);
+        cancel_work_sync(&sc->paprd_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
         mutex_unlock(&sc->mutex);
 }
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 1ec836cf1c0d..257b10ba6f57 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -28,6 +28,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
         { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
         { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
         { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
+        { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
         { 0 }
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 02b605273ca5..600ee0ba2880 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1203,11 +1203,8 @@ static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta,
 
         if (sta->ht_cap.ht_supported) {
                 caps = WLAN_RC_HT_FLAG;
-                if (sc->sc_ah->caps.tx_chainmask != 1 &&
-                    ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_DS, 0, NULL)) {
-                        if (sta->ht_cap.mcs.rx_mask[1])
-                                caps |= WLAN_RC_DS_FLAG;
-                }
+                if (sta->ht_cap.mcs.rx_mask[1])
+                        caps |= WLAN_RC_DS_FLAG;
                 if (is_cw40)
                         caps |= WLAN_RC_40_FLAG;
                 if (is_sgi)
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index d373364ef8a9..da0cfe90c38a 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -116,9 +116,6 @@ static void ath_opmode_init(struct ath_softc *sc)
         /* configure operational mode */
         ath9k_hw_setopmode(ah);
 
-        /* Handle any link-level address change. */
-        ath9k_hw_setmac(ah, common->macaddr);
-
         /* calculate and install multicast filter */
         mfilt[0] = mfilt[1] = ~0;
         ath9k_hw_setmcastfilter(ah, mfilt[0], mfilt[1]);
@@ -295,7 +292,7 @@ static void ath_edma_start_recv(struct ath_softc *sc)
 
         ath_opmode_init(sc);
 
-        ath9k_hw_startpcureceive(sc->sc_ah);
+        ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_SCANNING));
 }
 
 static void ath_edma_stop_recv(struct ath_softc *sc)
@@ -501,7 +498,7 @@ int ath_startrecv(struct ath_softc *sc)
 start_recv:
         spin_unlock_bh(&sc->rx.rxbuflock);
         ath_opmode_init(sc);
-        ath9k_hw_startpcureceive(ah);
+        ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_SCANNING));
 
         return 0;
 }
@@ -1002,8 +999,6 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
                                    struct ieee80211_rx_status *rx_status,
                                    bool *decrypt_error)
 {
-        struct ath_hw *ah = common->ah;
-
         memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
 
         /*
@@ -1018,7 +1013,6 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
         if (ath9k_process_rate(common, hw, rx_stats, rx_status))
                 return -EINVAL;
 
-        rx_status->mactime = ath9k_hw_extend_tsf(ah, rx_stats->rs_tstamp);
         rx_status->band = hw->conf.channel->band;
         rx_status->freq = hw->conf.channel->center_freq;
         rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
@@ -1100,6 +1094,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
         bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
         int dma_type;
         u8 rx_status_len = ah->caps.rx_status_len;
+        u64 tsf = 0;
+        u32 tsf_lower = 0;
 
         if (edma)
                 dma_type = DMA_BIDIRECTIONAL;
@@ -1109,6 +1105,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
         qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
         spin_lock_bh(&sc->rx.rxbuflock);
 
+        tsf = ath9k_hw_gettsf64(ah);
+        tsf_lower = tsf & 0xffffffff;
+
         do {
                 /* If handling rx interrupt and flush is in progress => exit */
                 if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0))
@@ -1141,6 +1140,15 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (flush)
                         goto requeue;
 
+                rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
+                if (rs.rs_tstamp > tsf_lower &&
+                    unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
+                        rxs->mactime -= 0x100000000ULL;
+
+                if (rs.rs_tstamp < tsf_lower &&
+                    unlikely(tsf_lower - rs.rs_tstamp > 0x10000000))
+                        rxs->mactime += 0x100000000ULL;
+
                 retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
                                                  rxs, &decrypt_error);
                 if (retval)
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c
index 105ad40968f6..89423ca23d2c 100644
--- a/drivers/net/wireless/ath/ath9k/virtual.c
+++ b/drivers/net/wireless/ath/ath9k/virtual.c
@@ -219,7 +219,7 @@ static int ath9k_send_nullfunc(struct ath_wiphy *aphy,
         info->control.rates[1].idx = -1;
 
         memset(&txctl, 0, sizeof(struct ath_tx_control));
-        txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO]];
+        txctl.txq = &sc->tx.txq[sc->tx.hwq_map[WME_AC_VO]];
         txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;
 
         if (ath_tx_start(aphy->hw, skb, &txctl) != 0)
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 7547c8f9a584..20221b8c04fd 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -941,6 +941,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
         if (!ATH_TXQ_SETUP(sc, qnum)) {
                 struct ath_txq *txq = &sc->tx.txq[qnum];
 
+                txq->axq_class = subtype;
                 txq->axq_qnum = qnum;
                 txq->axq_link = NULL;
                 INIT_LIST_HEAD(&txq->axq_q);
@@ -958,32 +959,6 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
         return &sc->tx.txq[qnum];
 }
 
-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype)
-{
-        int qnum;
-
-        switch (qtype) {
-        case ATH9K_TX_QUEUE_DATA:
-                if (haltype >= ARRAY_SIZE(sc->tx.hwq_map)) {
-                        ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
-                                  "HAL AC %u out of range, max %zu!\n",
-                                  haltype, ARRAY_SIZE(sc->tx.hwq_map));
-                        return -1;
-                }
-                qnum = sc->tx.hwq_map[haltype];
-                break;
-        case ATH9K_TX_QUEUE_BEACON:
-                qnum = sc->beacon.beaconq;
-                break;
-        case ATH9K_TX_QUEUE_CAB:
-                qnum = sc->beacon.cabq->axq_qnum;
-                break;
-        default:
-                qnum = -1;
-        }
-        return qnum;
-}
-
 int ath_txq_update(struct ath_softc *sc, int qnum,
                    struct ath9k_tx_queue_info *qinfo)
 {
@@ -1662,12 +1637,13 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
                 bf->bf_frmlen -= padsize;
         }
 
-        if (conf_is_ht(&hw->conf)) {
+        if (!txctl->paprd && conf_is_ht(&hw->conf)) {
                 bf->bf_state.bf_type |= BUF_HT;
                 if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
                         use_ldpc = true;
         }
 
+        bf->bf_state.bfs_paprd = txctl->paprd;
         bf->bf_flags = setup_tx_flags(skb, use_ldpc);
 
         bf->bf_keytype = get_hw_crypto_keytype(skb);
@@ -1742,6 +1718,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
                             bf->bf_buf_addr,
                             txctl->txq->axq_qnum);
 
+        if (bf->bf_state.bfs_paprd)
+                ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
+
         spin_lock_bh(&txctl->txq->axq_lock);
 
         if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
@@ -1785,7 +1764,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_txq *txq = txctl->txq;
         struct ath_buf *bf;
-        int r;
+        int q, r;
 
         bf = ath_tx_get_buffer(sc);
         if (!bf) {
@@ -1793,14 +1772,6 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return -1;
         }
 
-        bf->txq = txctl->txq;
-        spin_lock_bh(&bf->txq->axq_lock);
-        if (++bf->txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-                ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
-                txq->stopped = 1;
-        }
-        spin_unlock_bh(&bf->txq->axq_lock);
-
         r = ath_tx_setup_buffer(hw, bf, skb, txctl);
         if (unlikely(r)) {
                 ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
@@ -1821,6 +1792,17 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return r;
         }
 
+        q = skb_get_queue_mapping(skb);
+        if (q >= 4)
+                q = 0;
+
+        spin_lock_bh(&txq->axq_lock);
+        if (++sc->tx.pending_frames[q] > ATH_MAX_QDEPTH && !txq->stopped) {
+                ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
+                txq->stopped = 1;
+        }
+        spin_unlock_bh(&txq->axq_lock);
+
         ath_tx_start_dma(sc, bf, txctl);
 
         return 0;
@@ -1890,7 +1872,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
-        int padpos, padsize;
+        int q, padpos, padsize;
 
         ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
 
@@ -1929,8 +1911,16 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 
         if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
                 ath9k_tx_status(hw, skb);
-        else
+        else {
+                q = skb_get_queue_mapping(skb);
+                if (q >= 4)
+                        q = 0;
+
+                if (--sc->tx.pending_frames[q] < 0)
+                        sc->tx.pending_frames[q] = 0;
+
                 ieee80211_tx_status(hw, skb);
+        }
 }
 
 static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
@@ -1951,16 +1941,15 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
                         tx_flags |= ATH_TX_XRETRY;
         }
 
-        if (bf->txq) {
-                spin_lock_bh(&bf->txq->axq_lock);
-                bf->txq->pending_frames--;
-                spin_unlock_bh(&bf->txq->axq_lock);
-                bf->txq = NULL;
-        }
-
         dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
-        ath_tx_complete(sc, skb, bf->aphy, tx_flags);
-        ath_debug_stat_tx(sc, txq, bf, ts);
+
+        if (bf->bf_state.bfs_paprd) {
+                sc->paprd_txok = txok;
+                complete(&sc->paprd_complete);
+        } else {
+                ath_tx_complete(sc, skb, bf->aphy, tx_flags);
+                ath_debug_stat_tx(sc, txq, bf, ts);
+        }
 
         /*
          * Return the list of ath_buf of this mpdu to free queue
@@ -2045,13 +2034,14 @@ static void ath_wake_mac80211_queue(struct ath_softc *sc, struct ath_txq *txq)
 {
         int qnum;
 
+        qnum = ath_get_mac80211_qnum(txq->axq_class, sc);
+        if (qnum == -1)
+                return;
+
         spin_lock_bh(&txq->axq_lock);
-        if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
-                qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
-                if (qnum != -1) {
-                        ath_mac80211_start_queue(sc, qnum);
-                        txq->stopped = 0;
-                }
+        if (txq->stopped && sc->tx.pending_frames[qnum] < ATH_MAX_QDEPTH) {
+                ath_mac80211_start_queue(sc, qnum);
+                txq->stopped = 0;
         }
         spin_unlock_bh(&txq->axq_lock);
 }
@@ -2422,26 +2412,8 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
         for (acno = 0, ac = &an->ac[acno];
              acno < WME_NUM_AC; acno++, ac++) {
                 ac->sched    = false;
+                ac->qnum = sc->tx.hwq_map[acno];
                 INIT_LIST_HEAD(&ac->tid_q);
-
-                switch (acno) {
-                case WME_AC_BE:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
-                        break;
-                case WME_AC_BK:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BK);
-                        break;
-                case WME_AC_VI:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VI);
-                        break;
-                case WME_AC_VO:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VO);
-                        break;
-                }
         }
 }
 
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index db72461c486b..29b31a694b59 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -594,6 +594,7 @@ static int prism2_config(struct pcmcia_device *link)
         local_info_t *local;
         int ret = 1;
         struct hostap_cs_priv *hw_priv;
+        unsigned long flags;
 
         PDEBUG(DEBUG_FLOW, "prism2_config()\n");
 
@@ -625,9 +626,15 @@ static int prism2_config(struct pcmcia_device *link)
         local->hw_priv = hw_priv;
         hw_priv->link = link;
 
+        /*
+         * Make sure the IRQ handler cannot proceed until at least
+         * dev->base_addr is initialized.
+         */
+        spin_lock_irqsave(&local->irq_init_lock, flags);
+
         ret = pcmcia_request_irq(link, prism2_interrupt);
         if (ret)
-                goto failed;
+                goto failed_unlock;
 
         /*
          * This actually configures the PCMCIA socket -- setting up
@@ -636,11 +643,13 @@ static int prism2_config(struct pcmcia_device *link)
          */
         ret = pcmcia_request_configuration(link, &link->conf);
         if (ret)
-                goto failed;
+                goto failed_unlock;
 
         dev->irq = link->irq;
         dev->base_addr = link->io.BasePort1;
 
+        spin_unlock_irqrestore(&local->irq_init_lock, flags);
+
         /* Finally, report what we've done */
         printk(KERN_INFO "%s: index 0x%02x: ",
                dev_info, link->conf.ConfigIndex);
@@ -667,6 +676,8 @@ static int prism2_config(struct pcmcia_device *link)
 
         return ret;
 
+ failed_unlock:
+         spin_unlock_irqrestore(&local->irq_init_lock, flags);
  failed:
         kfree(hw_priv);
         prism2_release((u_long)link);
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index ff9b5c882184..2f999fc94f60 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2621,6 +2621,18 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
         iface = netdev_priv(dev);
         local = iface->local;
 
+        /* Detect early interrupt before driver is fully configued */
+        spin_lock(&local->irq_init_lock);
+        if (!dev->base_addr) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",
+                               dev->name);
+                }
+                spin_unlock(&local->irq_init_lock);
+                return IRQ_HANDLED;
+        }
+        spin_unlock(&local->irq_init_lock);
+
         prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
 
         if (local->func->card_present && !local->func->card_present(local)) {
@@ -3138,6 +3150,7 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
         spin_lock_init(&local->cmdlock);
         spin_lock_init(&local->baplock);
         spin_lock_init(&local->lock);
+        spin_lock_init(&local->irq_init_lock);
         mutex_init(&local->rid_bap_mtx);
 
         if (card_idx < 0 || card_idx >= MAX_PARM_DEVICES)
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index c02f8667a7e0..1c66b3c1030d 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -654,7 +654,7 @@ struct local_info {
         rwlock_t iface_lock; /* hostap_interfaces read lock; use write lock
                               * when removing entries from the list.
                               * TX and RX paths can use read lock. */
-        spinlock_t cmdlock, baplock, lock;
+        spinlock_t cmdlock, baplock, lock, irq_init_lock;
         struct mutex rid_bap_mtx;
         u16 infofid; /* MAC buffer id for info frame */
         /* txfid, intransmitfid, next_txtid, and next_alloc are protected by
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 8feaa1d358ea..cb2552a6777c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -96,7 +96,7 @@ static int network_mode = 0;
 static u32 ipw_debug_level;
 static int associate;
 static int auto_create = 1;
-static int led_support = 0;
+static int led_support = 1;
 static int disable = 0;
 static int bt_coexist = 0;
 static int hwcrypto = 0;
@@ -12082,7 +12082,7 @@ module_param(auto_create, int, 0444);
 MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
 
 module_param_named(led, led_support, int, 0444);
-MODULE_PARM_DESC(led, "enable led control on some systems (default 0 off)");
+MODULE_PARM_DESC(led, "enable led control on some systems (default 1 on)");
 
 module_param(debug, int, 0444);
 MODULE_PARM_DESC(debug, "debug output mask");
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 0fa1d51c9c5a..93d513e14186 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -844,7 +844,7 @@ static int iwl3945_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)
 
 static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 {
-        iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->dma_addr);
+        iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->bd_dma);
         iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma);
         iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0);
         iwl_write_direct32(priv, FH39_RCSR_CONFIG(0),
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 548f51d92de0..0e7b0661d61d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -486,7 +486,7 @@ int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 
         /* Tell device where to find RBD circular buffer in DRAM */
         iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
-                           (u32)(rxq->dma_addr >> 8));
+                           (u32)(rxq->bd_dma >> 8));
 
         /* Tell device where in DRAM to update its Rx status */
         iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
@@ -751,7 +751,7 @@ void iwlagn_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
         }
 
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          rxq->bd_dma);
         dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
                           rxq->rb_stts, rxq->rb_stts_dma);
         rxq->bd = NULL;
@@ -904,7 +904,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_rx_phy_res *phy_res;
         __le32 rx_pkt_status;
-        struct iwl4965_rx_mpdu_res_start *amsdu;
+        struct iwl_rx_mpdu_res_start *amsdu;
         u32 len;
         u32 ampdu_status;
         u32 rate_n_flags;
@@ -933,7 +933,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
                         return;
                 }
                 phy_res = &priv->_agn.last_phy_res;
-                amsdu = (struct iwl4965_rx_mpdu_res_start *)pkt->u.raw;
+                amsdu = (struct iwl_rx_mpdu_res_start *)pkt->u.raw;
                 header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu));
                 len = le16_to_cpu(amsdu->byte_count);
                 rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index f9134ceb69ab..84df7fca750d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -1324,6 +1324,11 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
         sta_id = ba_resp->sta_id;
         tid = ba_resp->tid;
         agg = &priv->stations[sta_id].tid[tid].agg;
+        if (unlikely(agg->txq_id != scd_flow)) {
+                IWL_ERR(priv, "BA scd_flow %d does not match txq_id %d\n",
+                        scd_flow, agg->txq_id);
+                return;
+        }
 
         /* Find index just before block-ack window */
         index = iwl_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 69e17d782883..d857f8496f69 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -941,6 +941,8 @@ void iwl_rx_handle(struct iwl_priv *priv)
                 fill_rx = 1;
 
         while (i != r) {
+                int len;
+
                 rxb = rxq->queue[i];
 
                 /* If an RXB doesn't have a Rx queue slot associated with it,
@@ -955,8 +957,9 @@ void iwl_rx_handle(struct iwl_priv *priv)
                                PCI_DMA_FROMDEVICE);
                 pkt = rxb_addr(rxb);
 
-                trace_iwlwifi_dev_rx(priv, pkt,
-                        le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
+                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+                len += sizeof(u32); /* account for status word */
+                trace_iwlwifi_dev_rx(priv, pkt, len);
 
                 /* Reclaim a command buffer only if this packet is a response
                  *   to a (driver-originated) command.
@@ -3462,10 +3465,12 @@ static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,
         int ret;
         u8 sta_id;
 
-        sta_priv->common.sta_id = IWL_INVALID_STATION;
-
         IWL_DEBUG_INFO(priv, "received request to add station %pM\n",
                         sta->addr);
+        mutex_lock(&priv->mutex);
+        IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",
+                        sta->addr);
+        sta_priv->common.sta_id = IWL_INVALID_STATION;
 
         atomic_set(&sta_priv->pending_frames, 0);
         if (vif->type == NL80211_IFTYPE_AP)
@@ -3477,6 +3482,7 @@ static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,
                 IWL_ERR(priv, "Unable to add station %pM (%d)\n",
                         sta->addr, ret);
                 /* Should we return success if return code is EEXIST ? */
+                mutex_unlock(&priv->mutex);
                 return ret;
         }
 
@@ -3486,6 +3492,7 @@ static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,
         IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",
                        sta->addr);
         iwl_rs_rate_init(priv, sta, sta_id);
+        mutex_unlock(&priv->mutex);
 
         return 0;
 }
@@ -3638,6 +3645,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
         cancel_delayed_work(&priv->scan_check);
         cancel_work_sync(&priv->start_internal_scan);
         cancel_delayed_work(&priv->alive_start);
+        cancel_work_sync(&priv->run_time_calib_work);
         cancel_work_sync(&priv->beacon_update);
         del_timer_sync(&priv->statistics_periodic);
         del_timer_sync(&priv->ucode_trace);
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index 7e8227773213..22fa947e8756 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -846,6 +846,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 }
         }
 
+        if (active_chains != priv->hw_params.valid_rx_ant &&
+            active_chains != priv->chain_noise_data.active_chains)
+                IWL_WARN(priv,
+                         "Detected that not all antennas are connected! "
+                         "Connected: %#x, valid: %#x.\n",
+                         active_chains, priv->hw_params.valid_rx_ant);
+
         /* Save for use within RXON, TX, SCAN commands, etc. */
         priv->chain_noise_data.active_chains = active_chains;
         IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index c579965ec556..28b1098334f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -1366,7 +1366,7 @@ struct iwl_rx_phy_res {
         __le16 reserved3;
 } __packed;
 
-struct iwl4965_rx_mpdu_res_start {
+struct iwl_rx_mpdu_res_start {
         __le16 byte_count;
         __le16 reserved;
 } __packed;
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index d9f21bb9d75d..cee3d12eb383 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -1018,8 +1018,13 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
                                                 rxq->write);
         pos += scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",
                                                 rxq->free_count);
-        pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",
+        if (rxq->rb_stts) {
+                pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",
                          le16_to_cpu(rxq->rb_stts->closed_rb_num) &  0x0FFF);
+        } else {
+                pos += scnprintf(buf + pos, bufsz - pos,
+                                        "closed_rb_num: Not Allocated\n");
+        }
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index fc6072cdd96f..338b5177029d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -348,7 +348,7 @@ struct iwl_host_cmd {
 /**
  * struct iwl_rx_queue - Rx queue
  * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)
- * @dma_addr: bus address of buffer of receive buffer descriptors (rbd)
+ * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)
  * @read: Shared index to newest available Rx buffer
  * @write: Shared index to oldest written Rx packet
  * @free_count: Number of pre-allocated buffers in rx_free
@@ -362,7 +362,7 @@ struct iwl_host_cmd {
  */
 struct iwl_rx_queue {
         __le32 *bd;
-        dma_addr_t dma_addr;
+        dma_addr_t bd_dma;
         struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
         struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];
         u32 read;
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index 5e32057d6938..86a353765796 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -175,7 +175,7 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)
         INIT_LIST_HEAD(&rxq->rx_used);
 
         /* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
-        rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->dma_addr,
+        rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
                                      GFP_KERNEL);
         if (!rxq->bd)
                 goto err_bd;
@@ -199,7 +199,7 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)
 
 err_rb:
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          rxq->bd_dma);
 err_bd:
         return -ENOMEM;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index b8bcd48eb8fa..798f93e0ff50 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -500,6 +500,7 @@ void iwl_bg_abort_scan(struct work_struct *work)
 
         mutex_lock(&priv->mutex);
 
+        cancel_delayed_work_sync(&priv->scan_check);
         set_bit(STATUS_SCAN_ABORTING, &priv->status);
         iwl_send_scan_abort(priv);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index c7127132c298..d57df6c02db3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -1373,10 +1373,14 @@ int iwl_mac_sta_remove(struct ieee80211_hw *hw,
 
         IWL_DEBUG_INFO(priv, "received request to remove station %pM\n",
                         sta->addr);
+        mutex_lock(&priv->mutex);
+        IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n",
+                        sta->addr);
         ret = iwl_remove_station(priv, sta_common->sta_id, sta->addr);
         if (ret)
                 IWL_ERR(priv, "Error removing station %pM\n",
                         sta->addr);
+        mutex_unlock(&priv->mutex);
         return ret;
 }
 EXPORT_SYMBOL(iwl_mac_sta_remove);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 0f16c7d518f7..697fa6caaceb 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1171,7 +1171,7 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx
         }
 
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          rxq->bd_dma);
         dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
                           rxq->rb_stts, rxq->rb_stts_dma);
         rxq->bd = NULL;
@@ -1252,6 +1252,8 @@ static void iwl3945_rx_handle(struct iwl_priv *priv)
                 IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);
 
         while (i != r) {
+                int len;
+
                 rxb = rxq->queue[i];
 
                 /* If an RXB doesn't have a Rx queue slot associated with it,
@@ -1266,8 +1268,9 @@ static void iwl3945_rx_handle(struct iwl_priv *priv)
                                PCI_DMA_FROMDEVICE);
                 pkt = rxb_addr(rxb);
 
-                trace_iwlwifi_dev_rx(priv, pkt,
-                        le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
+                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+                len += sizeof(u32); /* account for status word */
+                trace_iwlwifi_dev_rx(priv, pkt, len);
 
                 /* Reclaim a command buffer only if this packet is a response
                  *   to a (driver-originated) command.
@@ -3360,10 +3363,13 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw,
         bool is_ap = vif->type == NL80211_IFTYPE_STATION;
         u8 sta_id;
 
-        sta_priv->common.sta_id = IWL_INVALID_STATION;
-
         IWL_DEBUG_INFO(priv, "received request to add station %pM\n",
                         sta->addr);
+        mutex_lock(&priv->mutex);
+        IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",
+                        sta->addr);
+        sta_priv->common.sta_id = IWL_INVALID_STATION;
+
 
         ret = iwl_add_station_common(priv, sta->addr, is_ap, &sta->ht_cap,
                                      &sta_id);
@@ -3371,6 +3377,7 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw,
                 IWL_ERR(priv, "Unable to add station %pM (%d)\n",
                         sta->addr, ret);
                 /* Should we return success if return code is EEXIST ? */
+                mutex_unlock(&priv->mutex);
                 return ret;
         }
 
@@ -3380,6 +3387,7 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw,
         IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",
                        sta->addr);
         iwl3945_rs_rate_init(priv, sta, sta_id);
+        mutex_unlock(&priv->mutex);
 
         return 0;
 }
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 6a04c2157f73..817fffc0de4b 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -549,7 +549,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
 
         prxpd = (struct rxpd *) skb->data;
 
-        stats.flag = 0;
+        memset(&stats, 0, sizeof(stats));
         if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK)))
                 stats.flag |= RX_FLAG_FAILED_FCS_CRC;
         stats.freq = priv->cur_freq;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 07c4528f6e6b..a5ea89cde8c4 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -41,6 +41,8 @@ static DEFINE_PCI_DEVICE_TABLE(p54p_table) = {
         { PCI_DEVICE(0x1260, 0x3877) },
         /* Intersil PRISM Javelin/Xbow Wireless LAN adapter */
         { PCI_DEVICE(0x1260, 0x3886) },
+        /* Intersil PRISM Xbow Wireless LAN adapter (Symbol AP-300) */
+        { PCI_DEVICE(0x1260, 0xffff) },
         { },
 };
 
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index b0318ea59b7f..ad595958b7df 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -69,7 +69,8 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x0915, 0x2002)},   /* Cohiba Proto board */
         {USB_DEVICE(0x0baf, 0x0118)},   /* U.S. Robotics U5 802.11g Adapter*/
         {USB_DEVICE(0x0bf8, 0x1009)},   /* FUJITSU E-5400 USB D1700*/
-        {USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
+        /* {USB_DEVICE(0x0cde, 0x0006)}, * Medion MD40900 already listed above,
+                                         * just noting it here for clarity */
         {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
         {USB_DEVICE(0x0cde, 0x0015)},   /* Zcomax XG-705A */
         {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 317b7807175e..552f9f4c73d6 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -1436,6 +1436,10 @@ struct mac_iveiv_entry {
 #define MAC_WCID_ATTRIBUTE_CIPHER       FIELD32(0x0000000e)
 #define MAC_WCID_ATTRIBUTE_BSS_IDX      FIELD32(0x00000070)
 #define MAC_WCID_ATTRIBUTE_RX_WIUDF     FIELD32(0x00000380)
+#define MAC_WCID_ATTRIBUTE_CIPHER_EXT   FIELD32(0x00000400)
+#define MAC_WCID_ATTRIBUTE_BSS_IDX_EXT  FIELD32(0x00000800)
+#define MAC_WCID_ATTRIBUTE_WAPI_MCBC    FIELD32(0x00008000)
+#define MAC_WCID_ATTRIBUTE_WAPI_KEY_IDX FIELD32(0xff000000)
 
 /*
  * SHARED_KEY_MODE:
@@ -1557,7 +1561,9 @@ struct mac_iveiv_entry {
  */
 
 /*
- * BBP 1: TX Antenna
+ * BBP 1: TX Antenna & Power
+ * POWER: 0 - normal, 1 - drop tx power by 6dBm, 2 - drop tx power by 12dBm,
+ *      3 - increase tx power by 6dBm
  */
 #define BBP1_TX_POWER                   FIELD8(0x07)
 #define BBP1_TX_ANTENNA                 FIELD8(0x18)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index ae20e6728b1e..14c361ae87be 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1,9 +1,9 @@
 /*
+        Copyright (C) 2010 Ivo van Doorn <IvDoorn@gmail.com>
         Copyright (C) 2009 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
         Copyright (C) 2009 Gertjan van Wingerde <gwingerde@gmail.com>
 
         Based on the original rt2800pci.c and rt2800usb.c.
-          Copyright (C) 2009 Ivo van Doorn <IvDoorn@gmail.com>
           Copyright (C) 2009 Alban Browaeys <prahal@yahoo.com>
           Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
           Copyright (C) 2009 Luis Correia <luis.f.correia@gmail.com>
@@ -41,10 +41,6 @@
 #include "rt2800lib.h"
 #include "rt2800.h"
 
-MODULE_AUTHOR("Bartlomiej Zolnierkiewicz");
-MODULE_DESCRIPTION("rt2800 library");
-MODULE_LICENSE("GPL");
-
 /*
  * Register access.
  * All access to the CSR registers will go through the methods
@@ -558,15 +554,28 @@ static void rt2800_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
 
         offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
 
-        rt2800_register_read(rt2x00dev, offset, &reg);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
-                           !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,
-                           (crypto->cmd == SET_KEY) * crypto->cipher);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
-                           (crypto->cmd == SET_KEY) * crypto->bssidx);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
-        rt2800_register_write(rt2x00dev, offset, reg);
+        if (crypto->cmd == SET_KEY) {
+                rt2800_register_read(rt2x00dev, offset, &reg);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
+                                   !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
+                /*
+                 * Both the cipher as the BSS Idx numbers are split in a main
+                 * value of 3 bits, and a extended field for adding one additional
+                 * bit to the value.
+                 */
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,
+                                   (crypto->cipher & 0x7));
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER_EXT,
+                                   (crypto->cipher & 0x8) >> 3);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
+                                   (crypto->bssidx & 0x7));
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX_EXT,
+                                   (crypto->bssidx & 0x8) >> 3);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
+                rt2800_register_write(rt2x00dev, offset, reg);
+        } else {
+                rt2800_register_write(rt2x00dev, offset, 0);
+        }
 
         offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
 
@@ -1079,7 +1088,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
         u8 r1;
 
         rt2800_bbp_read(rt2x00dev, 1, &r1);
-        rt2x00_set_field8(&reg, BBP1_TX_POWER, 0);
+        rt2x00_set_field8(&r1, BBP1_TX_POWER, 0);
         rt2800_bbp_write(rt2x00dev, 1, r1);
 
         rt2800_register_read(rt2x00dev, TX_PWR_CFG_0, &reg);
@@ -2497,6 +2506,18 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                                 rt2x00_eeprom_addr(rt2x00dev,
                                                    EEPROM_MAC_ADDR_0));
 
+        /*
+         * As rt2800 has a global fallback table we cannot specify
+         * more then one tx rate per frame but since the hw will
+         * try several rates (based on the fallback table) we should
+         * still initialize max_rates to the maximum number of rates
+         * we are going to try. Otherwise mac80211 will truncate our
+         * reported tx rates and the rc algortihm will end up with
+         * incorrect data.
+         */
+        rt2x00dev->hw->max_rates = 7;
+        rt2x00dev->hw->max_rate_tries = 1;
+
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &eeprom);
 
         /*
@@ -2749,3 +2770,8 @@ const struct ieee80211_ops rt2800_mac80211_ops = {
         .rfkill_poll            = rt2x00mac_rfkill_poll,
 };
 EXPORT_SYMBOL_GPL(rt2800_mac80211_ops);
+
+MODULE_AUTHOR(DRV_PROJECT ", Bartlomiej Zolnierkiewicz");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("Ralink RT2800 library");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index b5a871eb8881..e5ea670a18db 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -51,7 +51,7 @@
 /*
  * Allow hardware encryption to be disabled.
  */
-static int modparam_nohwcrypt = 1;
+static int modparam_nohwcrypt = 0;
 module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
@@ -813,29 +813,24 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
         struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
-        u32 old_reg;
         int wcid, ack, pid, tx_wcid, tx_ack, tx_pid;
         u16 mcs, real_mcs;
+        int i;
 
         /*
-         * During each loop we will compare the freshly read
-         * TX_STA_FIFO register value with the value read from
-         * the previous loop. If the 2 values are equal then
-         * we should stop processing because the chance it
-         * quite big that the device has been unplugged and
-         * we risk going into an endless loop.
+         * TX_STA_FIFO is a stack of X entries, hence read TX_STA_FIFO
+         * at most X times and also stop processing once the TX_STA_FIFO_VALID
+         * flag is not set anymore.
+         *
+         * The legacy drivers use X=TX_RING_SIZE but state in a comment
+         * that the TX_STA_FIFO stack has a size of 16. We stick to our
+         * tx ring size for now.
          */
-        old_reg = 0;
-
-        while (1) {
+        for (i = 0; i < TX_ENTRIES; i++) {
                 rt2800_register_read(rt2x00dev, TX_STA_FIFO, &reg);
                 if (!rt2x00_get_field32(reg, TX_STA_FIFO_VALID))
                         break;
 
-                if (old_reg == reg)
-                        break;
-                old_reg = reg;
-
                 wcid    = rt2x00_get_field32(reg, TX_STA_FIFO_WCID);
                 ack     = rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED);
                 pid     = rt2x00_get_field32(reg, TX_STA_FIFO_PID_TYPE);
@@ -903,8 +898,12 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                         txdesc.retry = 7;
                 }
 
-                __set_bit(TXDONE_FALLBACK, &txdesc.flags);
-
+                /*
+                 * the frame was retried at least once
+                 * -> hw used fallback rates
+                 */
+                if (txdesc.retry)
+                        __set_bit(TXDONE_FALLBACK, &txdesc.flags);
 
                 rt2x00pci_txdone(entry, &txdesc);
         }
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index c437960de3ed..f18c12a19cc9 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -45,7 +45,7 @@
 /*
  * Allow hardware encryption to be disabled.
  */
-static int modparam_nohwcrypt = 1;
+static int modparam_nohwcrypt = 0;
 module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 0b8efe8e6785..339cc84bf4fb 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -236,8 +236,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
          */
         success =
             test_bit(TXDONE_SUCCESS, &txdesc->flags) ||
-            test_bit(TXDONE_UNKNOWN, &txdesc->flags) ||
-            test_bit(TXDONE_FALLBACK, &txdesc->flags);
+            test_bit(TXDONE_UNKNOWN, &txdesc->flags);
 
         /*
          * Update TX statistics.
@@ -259,11 +258,22 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         /*
          * Frame was send with retries, hardware tried
          * different rates to send out the frame, at each
-         * retry it lowered the rate 1 step.
+         * retry it lowered the rate 1 step except when the
+         * lowest rate was used.
          */
         for (i = 0; i < retry_rates && i < IEEE80211_TX_MAX_RATES; i++) {
                 tx_info->status.rates[i].idx = rate_idx - i;
                 tx_info->status.rates[i].flags = rate_flags;
+
+                if (rate_idx - i == 0) {
+                        /*
+                         * The lowest rate (index 0) was used until the
+                         * number of max retries was reached.
+                         */
+                        tx_info->status.rates[i].count = retry_rates - i;
+                        i++;
+                        break;
+                }
                 tx_info->status.rates[i].count = 1;
         }
         if (i < (IEEE80211_TX_MAX_RATES - 1))
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 35858b178e8f..f91637147116 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -353,13 +353,18 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         /*
          * Check if more fragments are pending
          */
-        if (ieee80211_has_morefrags(hdr->frame_control) ||
-            (tx_info->flags & IEEE80211_TX_CTL_MORE_FRAMES)) {
+        if (ieee80211_has_morefrags(hdr->frame_control)) {
                 __set_bit(ENTRY_TXD_BURST, &txdesc->flags);
                 __set_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags);
         }
 
         /*
+         * Check if more frames (!= fragments) are pending
+         */
+        if (tx_info->flags & IEEE80211_TX_CTL_MORE_FRAMES)
+                __set_bit(ENTRY_TXD_BURST, &txdesc->flags);
+
+        /*
          * Beacons and probe responses require the tsf timestamp
          * to be inserted into the frame, except for a frame that has been injected
          * through a monitor interface. This latter is needed for testing a
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index f79170849add..bd54f55a8cb9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -213,9 +213,16 @@ struct rxdone_entry_desc {
 /**
  * enum txdone_entry_desc_flags: Flags for &struct txdone_entry_desc
  *
+ * Every txdone report has to contain the basic result of the
+ * transmission, either &TXDONE_UNKNOWN, &TXDONE_SUCCESS or
+ * &TXDONE_FAILURE. The flag &TXDONE_FALLBACK can be used in
+ * conjunction with all of these flags but should only be set
+ * if retires > 0. The flag &TXDONE_EXCESSIVE_RETRY can only be used
+ * in conjunction with &TXDONE_FAILURE.
+ *
  * @TXDONE_UNKNOWN: Hardware could not determine success of transmission.
  * @TXDONE_SUCCESS: Frame was successfully send
- * @TXDONE_FALLBACK: Frame was successfully send using a fallback rate.
+ * @TXDONE_FALLBACK: Hardware used fallback rates for retries
  * @TXDONE_FAILURE: Frame was not successfully send
  * @TXDONE_EXCESSIVE_RETRY: In addition to &TXDONE_FAILURE, the
  *      frame transmission failed due to excessive retries.
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 243df08ae910..7ca383478eeb 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -931,6 +931,9 @@ static void rt61pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_DOWN, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_STEP, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_FALLBACK_CCK, 0);
         rt2x00_set_field32(&reg, TXRX_CSR4_LONG_RETRY_LIMIT,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, TXRX_CSR4_SHORT_RETRY_LIMIT,
@@ -2049,29 +2052,24 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
         struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
-        u32 old_reg;
         int type;
         int index;
+        int i;
 
         /*
-         * During each loop we will compare the freshly read
-         * STA_CSR4 register value with the value read from
-         * the previous loop. If the 2 values are equal then
-         * we should stop processing because the chance is
-         * quite big that the device has been unplugged and
-         * we risk going into an endless loop.
+         * TX_STA_FIFO is a stack of X entries, hence read TX_STA_FIFO
+         * at most X times and also stop processing once the TX_STA_FIFO_VALID
+         * flag is not set anymore.
+         *
+         * The legacy drivers use X=TX_RING_SIZE but state in a comment
+         * that the TX_STA_FIFO stack has a size of 16. We stick to our
+         * tx ring size for now.
          */
-        old_reg = 0;
-
-        while (1) {
+        for (i = 0; i < TX_ENTRIES; i++) {
                 rt2x00pci_register_read(rt2x00dev, STA_CSR4, &reg);
                 if (!rt2x00_get_field32(reg, STA_CSR4_VALID))
                         break;
 
-                if (old_reg == reg)
-                        break;
-                old_reg = reg;
-
                 /*
                  * Skip this entry when it contains an invalid
                  * queue identication number.
@@ -2130,6 +2128,13 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                 }
                 txdesc.retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT);
 
+                /*
+                 * the frame was retried at least once
+                 * -> hw used fallback rates
+                 */
+                if (txdesc.retry)
+                        __set_bit(TXDONE_FALLBACK, &txdesc.flags);
+
                 rt2x00pci_txdone(entry, &txdesc);
         }
 }
@@ -2587,6 +2592,18 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                                                    EEPROM_MAC_ADDR_0));
 
         /*
+         * As rt61 has a global fallback table we cannot specify
+         * more then one tx rate per frame but since the hw will
+         * try several rates (based on the fallback table) we should
+         * still initialize max_rates to the maximum number of rates
+         * we are going to try. Otherwise mac80211 will truncate our
+         * reported tx rates and the rc algortihm will end up with
+         * incorrect data.
+         */
+        rt2x00dev->hw->max_rates = 7;
+        rt2x00dev->hw->max_rate_tries = 1;
+
+        /*
          * Initialize hw_mode information.
          */
         spec->supported_bands = SUPPORT_BAND_2GHZ;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 113ad690f9d3..d06d90f003e7 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -816,6 +816,9 @@ static void rt73usb_config_retry_limit(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         rt2x00usb_register_read(rt2x00dev, TXRX_CSR4, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_DOWN, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_STEP, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_FALLBACK_CCK, 0);
         rt2x00_set_field32(&reg, TXRX_CSR4_LONG_RETRY_LIMIT,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, TXRX_CSR4_SHORT_RETRY_LIMIT,
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 163a8a06b22d..43307bd42a69 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -42,7 +42,8 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = {
         { ZD_REGDOMAIN_IC, "CA" },
         { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */
         { ZD_REGDOMAIN_JAPAN, "JP" },
-        { ZD_REGDOMAIN_JAPAN_ADD, "JP" },
+        { ZD_REGDOMAIN_JAPAN_2, "JP" },
+        { ZD_REGDOMAIN_JAPAN_3, "JP" },
         { ZD_REGDOMAIN_SPAIN, "ES" },
         { ZD_REGDOMAIN_FRANCE, "FR" },
 };
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index e4c70e359ced..a6d86b996c79 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -212,8 +212,9 @@ struct zd_mac {
 #define ZD_REGDOMAIN_ETSI       0x30
 #define ZD_REGDOMAIN_SPAIN      0x31
 #define ZD_REGDOMAIN_FRANCE     0x32
-#define ZD_REGDOMAIN_JAPAN_ADD  0x40
+#define ZD_REGDOMAIN_JAPAN_2    0x40
 #define ZD_REGDOMAIN_JAPAN      0x41
+#define ZD_REGDOMAIN_JAPAN_3    0x49
 
 enum {
         MIN_CHANNEL24 = 1,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index a56bac1e69e0..9c45b905aefc 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -810,6 +810,7 @@ struct cfg80211_disassoc_request {
  * @beacon_interval: beacon interval to use
  * @privacy: this is a protected network, keys will be configured
  *      after joining
+ * @basic_rates: bitmap of basic rates to use when creating the IBSS
  */
 struct cfg80211_ibss_params {
         u8 *ssid;
@@ -818,6 +819,7 @@ struct cfg80211_ibss_params {
         u8 *ie;
         u8 ssid_len, ie_len;
         u16 beacon_interval;
+        u32 basic_rates;
         bool channel_fixed;
         bool privacy;
 };
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index abb3b1a9ddc9..fe1a3a603375 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -19,7 +19,6 @@
 #include <linux/wireless.h>
 #include <linux/device.h>
 #include <linux/ieee80211.h>
-#include <linux/inetdevice.h>
 #include <net/cfg80211.h>
 
 /**
@@ -147,6 +146,7 @@ struct ieee80211_low_level_stats {
  *      enabled/disabled (beaconing modes)
  * @BSS_CHANGED_CQM: Connection quality monitor config changed
  * @BSS_CHANGED_IBSS: IBSS join status changed
+ * @BSS_CHANGED_ARP_FILTER: Hardware ARP filter address list or state changed.
  */
 enum ieee80211_bss_change {
         BSS_CHANGED_ASSOC               = 1<<0,
@@ -161,10 +161,18 @@ enum ieee80211_bss_change {
         BSS_CHANGED_BEACON_ENABLED      = 1<<9,
         BSS_CHANGED_CQM                 = 1<<10,
         BSS_CHANGED_IBSS                = 1<<11,
+        BSS_CHANGED_ARP_FILTER          = 1<<12,
 
         /* when adding here, make sure to change ieee80211_reconfig */
 };
 
+/*
+ * The maximum number of IPv4 addresses listed for ARP filtering. If the number
+ * of addresses for an interface increase beyond this value, hardware ARP
+ * filtering will be disabled.
+ */
+#define IEEE80211_BSS_ARP_ADDR_LIST_LEN 4
+
 /**
  * struct ieee80211_bss_conf - holds the BSS's changing parameters
  *
@@ -200,6 +208,15 @@ enum ieee80211_bss_change {
  * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
  *      implies disabled
  * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis
+ * @arp_addr_list: List of IPv4 addresses for hardware ARP filtering. The
+ *      may filter ARP queries targeted for other addresses than listed here.
+ *      The driver must allow ARP queries targeted for all address listed here
+ *      to pass through. An empty list implies no ARP queries need to pass.
+ * @arp_addr_cnt: Number of addresses currently on the list.
+ * @arp_filter_enabled: Enable ARP filtering - if enabled, the hardware may
+ *      filter ARP queries based on the @arp_addr_list, if disabled, the
+ *      hardware must not perform any ARP filtering. Note, that the filter will
+ *      be enabled also in promiscuous mode.
  */
 struct ieee80211_bss_conf {
         const u8 *bssid;
@@ -220,6 +237,9 @@ struct ieee80211_bss_conf {
         s32 cqm_rssi_thold;
         u32 cqm_rssi_hyst;
         enum nl80211_channel_type channel_type;
+        __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];
+        u8 arp_addr_cnt;
+        bool arp_filter_enabled;
 };
 
 /**
@@ -675,9 +695,6 @@ enum ieee80211_smps_mode {
  * @dynamic_ps_timeout: The dynamic powersave timeout (in ms), see the
  *      powersave documentation below. This variable is valid only when
  *      the CONF_PS flag is set.
- * @dynamic_ps_forced_timeout: The dynamic powersave timeout (in ms) configured
- *      by cfg80211 (essentially, wext) If set, this value overrules the value
- *      chosen by mac80211 based on ps qos network latency.
  *
  * @power_level: requested transmit power (in dBm)
  *
@@ -697,7 +714,7 @@ enum ieee80211_smps_mode {
  */
 struct ieee80211_conf {
         u32 flags;
-        int power_level, dynamic_ps_timeout, dynamic_ps_forced_timeout;
+        int power_level, dynamic_ps_timeout;
         int max_sleep_period;
 
         u16 listen_interval;
@@ -1445,7 +1462,7 @@ enum ieee80211_filter_flags {
  *
  * Note that drivers MUST be able to deal with a TX aggregation
  * session being stopped even before they OK'ed starting it by
- * calling ieee80211_start_tx_ba_cb(_irqsafe), because the peer
+ * calling ieee80211_start_tx_ba_cb_irqsafe, because the peer
  * might receive the addBA frame and send a delBA right away!
  *
  * @IEEE80211_AMPDU_RX_START: start Rx aggregation
@@ -1529,16 +1546,6 @@ enum ieee80211_ampdu_mlme_action {
  *      of the bss parameters has changed when a call is made. The callback
  *      can sleep.
  *
- * @configure_arp_filter: Configuration function for hardware ARP query filter.
- *      This function is called with all the IP addresses configured to the
- *      interface as argument - all ARP queries targeted to any of these
- *      addresses must pass through. If the hardware filter does not support
- *      enought addresses, hardware filtering must be disabled. The ifa_list
- *      argument may be NULL, indicating that filtering must be disabled.
- *      This function is called upon association complete with current
- *      address(es), and while associated whenever the IP address(es) change.
- *      The callback can sleep.
- *
  * @prepare_multicast: Prepare for multicast filter configuration.
  *      This callback is optional, and its return value is passed
  *      to configure_filter(). This callback must be atomic.
@@ -1640,7 +1647,7 @@ enum ieee80211_ampdu_mlme_action {
  *      is the first frame we expect to perform the action on. Notice
  *      that TX/RX_STOP can pass NULL for this parameter.
  *      Returns a negative error code on failure.
- *      The callback must be atomic.
+ *      The callback can sleep.
  *
  * @get_survey: Return per-channel survey information
  *
@@ -1678,9 +1685,6 @@ struct ieee80211_ops {
                                  struct ieee80211_vif *vif,
                                  struct ieee80211_bss_conf *info,
                                  u32 changed);
-        int (*configure_arp_filter)(struct ieee80211_hw *hw,
-                                    struct ieee80211_vif *vif,
-                                    struct in_ifaddr *ifa_list);
         u64 (*prepare_multicast)(struct ieee80211_hw *hw,
                                  struct netdev_hw_addr_list *mc_list);
         void (*configure_filter)(struct ieee80211_hw *hw,
@@ -2314,25 +2318,14 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
 int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
 
 /**
- * ieee80211_start_tx_ba_cb - low level driver ready to aggregate.
- * @vif: &struct ieee80211_vif pointer from the add_interface callback
- * @ra: receiver address of the BA session recipient.
- * @tid: the TID to BA on.
- *
- * This function must be called by low level driver once it has
- * finished with preparations for the BA session.
- */
-void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
-
-/**
  * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate.
  * @vif: &struct ieee80211_vif pointer from the add_interface callback
  * @ra: receiver address of the BA session recipient.
  * @tid: the TID to BA on.
  *
  * This function must be called by low level driver once it has
- * finished with preparations for the BA session.
- * This version of the function is IRQ-safe.
+ * finished with preparations for the BA session. It can be called
+ * from any context.
  */
 void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                       u16 tid);
@@ -2351,25 +2344,14 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
 int ieee80211_stop_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
 
 /**
- * ieee80211_stop_tx_ba_cb - low level driver ready to stop aggregate.
- * @vif: &struct ieee80211_vif pointer from the add_interface callback
- * @ra: receiver address of the BA session recipient.
- * @tid: the desired TID to BA on.
- *
- * This function must be called by low level driver once it has
- * finished with preparations for the BA session tear down.
- */
-void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
-
-/**
  * ieee80211_stop_tx_ba_cb_irqsafe - low level driver ready to stop aggregate.
  * @vif: &struct ieee80211_vif pointer from the add_interface callback
  * @ra: receiver address of the BA session recipient.
  * @tid: the desired TID to BA on.
  *
  * This function must be called by low level driver once it has
- * finished with preparations for the BA session tear down.
- * This version of the function is IRQ-safe.
+ * finished with preparations for the BA session tear down. It
+ * can be called from any context.
  */
 void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                      u16 tid);
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 6bb9a9a94960..965b272499fd 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -6,39 +6,70 @@
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
- * Copyright 2007-2008, Intel Corporation
+ * Copyright 2007-2010, Intel Corporation
  *
  * 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.
  */
 
+/**
+ * DOC: RX A-MPDU aggregation
+ *
+ * Aggregation on the RX side requires only implementing the
+ * @ampdu_action callback that is invoked to start/stop any
+ * block-ack sessions for RX aggregation.
+ *
+ * When RX aggregation is started by the peer, the driver is
+ * notified via @ampdu_action function, with the
+ * %IEEE80211_AMPDU_RX_START action, and may reject the request
+ * in which case a negative response is sent to the peer, if it
+ * accepts it a positive response is sent.
+ *
+ * While the session is active, the device/driver are required
+ * to de-aggregate frames and pass them up one by one to mac80211,
+ * which will handle the reorder buffer.
+ *
+ * When the aggregation session is stopped again by the peer or
+ * ourselves, the driver's @ampdu_action function will be called
+ * with the action %IEEE80211_AMPDU_RX_STOP. In this case, the
+ * call must not fail.
+ */
+
 #include <linux/ieee80211.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
 
-static void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
-                                            u16 initiator, u16 reason,
-                                            bool from_timer)
+static void ieee80211_free_tid_rx(struct rcu_head *h)
 {
-        struct ieee80211_local *local = sta->local;
-        struct tid_ampdu_rx *tid_rx;
+        struct tid_ampdu_rx *tid_rx =
+                container_of(h, struct tid_ampdu_rx, rcu_head);
         int i;
 
-        spin_lock_bh(&sta->lock);
+        for (i = 0; i < tid_rx->buf_size; i++)
+                dev_kfree_skb(tid_rx->reorder_buf[i]);
+        kfree(tid_rx->reorder_buf);
+        kfree(tid_rx->reorder_time);
+        kfree(tid_rx);
+}
 
-        /* check if TID is in operational state */
-        if (!sta->ampdu_mlme.tid_active_rx[tid]) {
-                spin_unlock_bh(&sta->lock);
-                return;
-        }
+void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
+                                     u16 initiator, u16 reason)
+{
+        struct ieee80211_local *local = sta->local;
+        struct tid_ampdu_rx *tid_rx;
 
-        sta->ampdu_mlme.tid_active_rx[tid] = false;
+        lockdep_assert_held(&sta->ampdu_mlme.mtx);
 
         tid_rx = sta->ampdu_mlme.tid_rx[tid];
 
+        if (!tid_rx)
+                return;
+
+        rcu_assign_pointer(sta->ampdu_mlme.tid_rx[tid], NULL);
+
 #ifdef CONFIG_MAC80211_HT_DEBUG
         printk(KERN_DEBUG "Rx BA session stop requested for %pM tid %u\n",
                sta->sta.addr, tid);
@@ -54,32 +85,17 @@ static void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
                 ieee80211_send_delba(sta->sdata, sta->sta.addr,
                                      tid, 0, reason);
 
-        /* free the reordering buffer */
-        for (i = 0; i < tid_rx->buf_size; i++) {
-                if (tid_rx->reorder_buf[i]) {
-                        /* release the reordered frames */
-                        dev_kfree_skb(tid_rx->reorder_buf[i]);
-                        tid_rx->stored_mpdu_num--;
-                        tid_rx->reorder_buf[i] = NULL;
-                }
-        }
-
-        /* free resources */
-        kfree(tid_rx->reorder_buf);
-        kfree(tid_rx->reorder_time);
-        sta->ampdu_mlme.tid_rx[tid] = NULL;
-
-        spin_unlock_bh(&sta->lock);
+        del_timer_sync(&tid_rx->session_timer);
 
-        if (!from_timer)
-                del_timer_sync(&tid_rx->session_timer);
-        kfree(tid_rx);
+        call_rcu(&tid_rx->rcu_head, ieee80211_free_tid_rx);
 }
 
 void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
                                     u16 initiator, u16 reason)
 {
-        ___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, false);
+        mutex_lock(&sta->ampdu_mlme.mtx);
+        ___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason);
+        mutex_unlock(&sta->ampdu_mlme.mtx);
 }
 
 /*
@@ -100,8 +116,8 @@ static void sta_rx_agg_session_timer_expired(unsigned long data)
 #ifdef CONFIG_MAC80211_HT_DEBUG
         printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);
 #endif
-        ___ieee80211_stop_rx_ba_session(sta, *ptid, WLAN_BACK_RECIPIENT,
-                                        WLAN_REASON_QSTA_TIMEOUT, true);
+        set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);
+        ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
 }
 
 static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *da, u16 tid,
@@ -212,9 +228,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
 
         /* examine state machine */
-        spin_lock_bh(&sta->lock);
+        mutex_lock(&sta->ampdu_mlme.mtx);
 
-        if (sta->ampdu_mlme.tid_active_rx[tid]) {
+        if (sta->ampdu_mlme.tid_rx[tid]) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 if (net_ratelimit())
                         printk(KERN_DEBUG "unexpected AddBA Req from "
@@ -225,9 +241,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         }
 
         /* prepare A-MPDU MLME for Rx aggregation */
-        sta->ampdu_mlme.tid_rx[tid] =
-                        kmalloc(sizeof(struct tid_ampdu_rx), GFP_ATOMIC);
-        if (!sta->ampdu_mlme.tid_rx[tid]) {
+        tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_ATOMIC);
+        if (!tid_agg_rx) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 if (net_ratelimit())
                         printk(KERN_ERR "allocate rx mlme to tid %d failed\n",
@@ -235,14 +250,11 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 #endif
                 goto end;
         }
-        /* rx timer */
-        sta->ampdu_mlme.tid_rx[tid]->session_timer.function =
-                                sta_rx_agg_session_timer_expired;
-        sta->ampdu_mlme.tid_rx[tid]->session_timer.data =
-                                (unsigned long)&sta->timer_to_tid[tid];
-        init_timer(&sta->ampdu_mlme.tid_rx[tid]->session_timer);
 
-        tid_agg_rx = sta->ampdu_mlme.tid_rx[tid];
+        /* rx timer */
+        tid_agg_rx->session_timer.function = sta_rx_agg_session_timer_expired;
+        tid_agg_rx->session_timer.data = (unsigned long)&sta->timer_to_tid[tid];
+        init_timer(&tid_agg_rx->session_timer);
 
         /* prepare reordering buffer */
         tid_agg_rx->reorder_buf =
@@ -257,8 +269,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 #endif
                 kfree(tid_agg_rx->reorder_buf);
                 kfree(tid_agg_rx->reorder_time);
-                kfree(sta->ampdu_mlme.tid_rx[tid]);
-                sta->ampdu_mlme.tid_rx[tid] = NULL;
+                kfree(tid_agg_rx);
                 goto end;
         }
 
@@ -270,13 +281,12 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
         if (ret) {
                 kfree(tid_agg_rx->reorder_buf);
+                kfree(tid_agg_rx->reorder_time);
                 kfree(tid_agg_rx);
-                sta->ampdu_mlme.tid_rx[tid] = NULL;
                 goto end;
         }
 
-        /* change state and send addba resp */
-        sta->ampdu_mlme.tid_active_rx[tid] = true;
+        /* update data */
         tid_agg_rx->dialog_token = dialog_token;
         tid_agg_rx->ssn = start_seq_num;
         tid_agg_rx->head_seq_num = start_seq_num;
@@ -284,8 +294,15 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         tid_agg_rx->timeout = timeout;
         tid_agg_rx->stored_mpdu_num = 0;
         status = WLAN_STATUS_SUCCESS;
+
+        /* activate it for RX */
+        rcu_assign_pointer(sta->ampdu_mlme.tid_rx[tid], tid_agg_rx);
+
+        if (timeout)
+                mod_timer(&tid_agg_rx->session_timer, TU_TO_EXP_TIME(timeout));
+
 end:
-        spin_unlock_bh(&sta->lock);
+        mutex_unlock(&sta->ampdu_mlme.mtx);
 
 end_no_lock:
         ieee80211_send_addba_resp(sta->sdata, sta->sta.addr, tid,
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index d1b6664a2532..c893f236acea 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -6,7 +6,7 @@
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
- * Copyright 2007-2009, Intel Corporation
+ * Copyright 2007-2010, Intel Corporation
  *
  * 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
@@ -21,28 +21,39 @@
 #include "wme.h"
 
 /**
- * DOC: TX aggregation
+ * DOC: TX A-MPDU aggregation
  *
  * Aggregation on the TX side requires setting the hardware flag
- * %IEEE80211_HW_AMPDU_AGGREGATION as well as, if present, the @ampdu_queues
- * hardware parameter to the number of hardware AMPDU queues. If there are no
- * hardware queues then the driver will (currently) have to do all frame
- * buffering.
+ * %IEEE80211_HW_AMPDU_AGGREGATION. The driver will then be handed
+ * packets with a flag indicating A-MPDU aggregation. The driver
+ * or device is responsible for actually aggregating the frames,
+ * as well as deciding how many and which to aggregate.
  *
- * When TX aggregation is started by some subsystem (usually the rate control
- * algorithm would be appropriate) by calling the
- * ieee80211_start_tx_ba_session() function, the driver will be notified via
- * its @ampdu_action function, with the %IEEE80211_AMPDU_TX_START action.
+ * When TX aggregation is started by some subsystem (usually the rate
+ * control algorithm would be appropriate) by calling the
+ * ieee80211_start_tx_ba_session() function, the driver will be
+ * notified via its @ampdu_action function, with the
+ * %IEEE80211_AMPDU_TX_START action.
  *
  * In response to that, the driver is later required to call the
- * ieee80211_start_tx_ba_cb() (or ieee80211_start_tx_ba_cb_irqsafe())
- * function, which will start the aggregation session.
+ * ieee80211_start_tx_ba_cb_irqsafe() function, which will really
+ * start the aggregation session after the peer has also responded.
+ * If the peer responds negatively, the session will be stopped
+ * again right away. Note that it is possible for the aggregation
+ * session to be stopped before the driver has indicated that it
+ * is done setting it up, in which case it must not indicate the
+ * setup completion.
  *
- * Similarly, when the aggregation session is stopped by
- * ieee80211_stop_tx_ba_session(), the driver's @ampdu_action function will
- * be called with the action %IEEE80211_AMPDU_TX_STOP. In this case, the
- * call must not fail, and the driver must later call ieee80211_stop_tx_ba_cb()
- * (or ieee80211_stop_tx_ba_cb_irqsafe()).
+ * Also note that, since we also need to wait for a response from
+ * the peer, the driver is notified of the completion of the
+ * handshake by the %IEEE80211_AMPDU_TX_OPERATIONAL action to the
+ * @ampdu_action callback.
+ *
+ * Similarly, when the aggregation session is stopped by the peer
+ * or something calling ieee80211_stop_tx_ba_session(), the driver's
+ * @ampdu_action function will be called with the action
+ * %IEEE80211_AMPDU_TX_STOP. In this case, the call must not fail,
+ * and the driver must later call ieee80211_stop_tx_ba_cb_irqsafe().
  */
 
 static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
@@ -125,25 +136,53 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1
         ieee80211_tx_skb(sdata, skb);
 }
 
+static void kfree_tid_tx(struct rcu_head *rcu_head)
+{
+        struct tid_ampdu_tx *tid_tx =
+            container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
+
+        kfree(tid_tx);
+}
+
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                     enum ieee80211_back_parties initiator)
 {
         struct ieee80211_local *local = sta->local;
+        struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
         int ret;
-        u8 *state;
+
+        lockdep_assert_held(&sta->ampdu_mlme.mtx);
+
+        if (!tid_tx)
+                return -ENOENT;
+
+        spin_lock_bh(&sta->lock);
+
+        if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {
+                /* not even started yet! */
+                rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
+                spin_unlock_bh(&sta->lock);
+                call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+                return 0;
+        }
+
+        spin_unlock_bh(&sta->lock);
 
 #ifdef CONFIG_MAC80211_HT_DEBUG
         printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n",
                sta->sta.addr, tid);
 #endif /* CONFIG_MAC80211_HT_DEBUG */
 
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
+        set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
 
-        if (*state == HT_AGG_STATE_OPERATIONAL)
-                sta->ampdu_mlme.addba_req_num[tid] = 0;
+        /*
+         * After this packets are no longer handed right through
+         * to the driver but are put onto tid_tx->pending instead,
+         * with locking to ensure proper access.
+         */
+        clear_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state);
 
-        *state = HT_AGG_STATE_REQ_STOP_BA_MSK |
-                (initiator << HT_AGG_STATE_INITIATOR_SHIFT);
+        tid_tx->stop_initiator = initiator;
 
         ret = drv_ampdu_action(local, sta->sdata,
                                IEEE80211_AMPDU_TX_STOP,
@@ -174,16 +213,14 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         u16 tid = *(u8 *)data;
         struct sta_info *sta = container_of((void *)data,
                 struct sta_info, timer_to_tid[tid]);
-        u8 *state;
-
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
+        struct tid_ampdu_tx *tid_tx;
 
         /* check if the TID waits for addBA response */
-        spin_lock_bh(&sta->lock);
-        if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK |
-                       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
-                                                HT_ADDBA_REQUESTED_MSK) {
-                spin_unlock_bh(&sta->lock);
+        rcu_read_lock();
+        tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]);
+        if (!tid_tx ||
+            test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {
+                rcu_read_unlock();
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "timer expired on tid %d but we are not "
                                 "(or no longer) expecting addBA response there\n",
@@ -196,8 +233,8 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         printk(KERN_DEBUG "addBA response timer expired on tid %d\n", tid);
 #endif
 
-        ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR);
-        spin_unlock_bh(&sta->lock);
+        ieee80211_stop_tx_ba_session(&sta->sta, tid);
+        rcu_read_unlock();
 }
 
 static inline int ieee80211_ac_from_tid(int tid)
@@ -205,14 +242,112 @@ static inline int ieee80211_ac_from_tid(int tid)
         return ieee802_1d_to_ac[tid & 7];
 }
 
+/*
+ * When multiple aggregation sessions on multiple stations
+ * are being created/destroyed simultaneously, we need to
+ * refcount the global queue stop caused by that in order
+ * to not get into a situation where one of the aggregation
+ * setup or teardown re-enables queues before the other is
+ * ready to handle that.
+ *
+ * These two functions take care of this issue by keeping
+ * a global "agg_queue_stop" refcount.
+ */
+static void __acquires(agg_queue)
+ieee80211_stop_queue_agg(struct ieee80211_local *local, int tid)
+{
+        int queue = ieee80211_ac_from_tid(tid);
+
+        if (atomic_inc_return(&local->agg_queue_stop[queue]) == 1)
+                ieee80211_stop_queue_by_reason(
+                        &local->hw, queue,
+                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        __acquire(agg_queue);
+}
+
+static void __releases(agg_queue)
+ieee80211_wake_queue_agg(struct ieee80211_local *local, int tid)
+{
+        int queue = ieee80211_ac_from_tid(tid);
+
+        if (atomic_dec_return(&local->agg_queue_stop[queue]) == 0)
+                ieee80211_wake_queue_by_reason(
+                        &local->hw, queue,
+                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        __release(agg_queue);
+}
+
+void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
+{
+        struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
+        struct ieee80211_local *local = sta->local;
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
+        u16 start_seq_num;
+        int ret;
+
+        lockdep_assert_held(&sta->ampdu_mlme.mtx);
+
+        /*
+         * While we're asking the driver about the aggregation,
+         * stop the AC queue so that we don't have to worry
+         * about frames that came in while we were doing that,
+         * which would require us to put them to the AC pending
+         * afterwards which just makes the code more complex.
+         */
+        ieee80211_stop_queue_agg(local, tid);
+
+        clear_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);
+
+        /*
+         * make sure no packets are being processed to get
+         * valid starting sequence number
+         */
+        synchronize_net();
+
+        start_seq_num = sta->tid_seq[tid] >> 4;
+
+        ret = drv_ampdu_action(local, sdata, IEEE80211_AMPDU_TX_START,
+                               &sta->sta, tid, &start_seq_num);
+        if (ret) {
+#ifdef CONFIG_MAC80211_HT_DEBUG
+                printk(KERN_DEBUG "BA request denied - HW unavailable for"
+                                        " tid %d\n", tid);
+#endif
+                spin_lock_bh(&sta->lock);
+                rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
+                spin_unlock_bh(&sta->lock);
+
+                ieee80211_wake_queue_agg(local, tid);
+                call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+                return;
+        }
+
+        /* we can take packets again now */
+        ieee80211_wake_queue_agg(local, tid);
+
+        /* activate the timer for the recipient's addBA response */
+        mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
+#ifdef CONFIG_MAC80211_HT_DEBUG
+        printk(KERN_DEBUG "activated addBA response timer on tid %d\n", tid);
+#endif
+
+        spin_lock_bh(&sta->lock);
+        sta->ampdu_mlme.addba_req_num[tid]++;
+        spin_unlock_bh(&sta->lock);
+
+        /* send AddBA request */
+        ieee80211_send_addba_request(sdata, sta->sta.addr, tid,
+                                     tid_tx->dialog_token, start_seq_num,
+                                     0x40, 5000);
+}
+
 int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
 {
         struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
         struct ieee80211_sub_if_data *sdata = sta->sdata;
         struct ieee80211_local *local = sdata->local;
-        u8 *state;
+        struct tid_ampdu_tx *tid_tx;
         int ret = 0;
-        u16 start_seq_num;
 
         trace_api_start_tx_ba_session(pubsta, tid);
 
@@ -239,24 +374,15 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
             sdata->vif.type != NL80211_IFTYPE_AP)
                 return -EINVAL;
 
-        if (test_sta_flags(sta, WLAN_STA_DISASSOC)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Disassociation is in progress. "
-                       "Denying BA session request\n");
-#endif
-                return -EINVAL;
-        }
-
         if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Suspend in progress. "
+                printk(KERN_DEBUG "BA sessions blocked. "
                        "Denying BA session request\n");
 #endif
                 return -EINVAL;
         }
 
         spin_lock_bh(&sta->lock);
-        spin_lock(&local->ampdu_lock);
 
         /* we have tried too many times, receiver does not want A-MPDU */
         if (sta->ampdu_mlme.addba_req_num[tid] > HT_AGG_MAX_RETRIES) {
@@ -264,9 +390,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
                 goto err_unlock_sta;
         }
 
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
+        tid_tx = sta->ampdu_mlme.tid_tx[tid];
         /* check if the TID is not in aggregation flow already */
-        if (*state != HT_AGG_STATE_IDLE) {
+        if (tid_tx) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "BA request denied - session is not "
                                  "idle on tid %u\n", tid);
@@ -275,96 +401,37 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
                 goto err_unlock_sta;
         }
 
-        /*
-         * While we're asking the driver about the aggregation,
-         * stop the AC queue so that we don't have to worry
-         * about frames that came in while we were doing that,
-         * which would require us to put them to the AC pending
-         * afterwards which just makes the code more complex.
-         */
-        ieee80211_stop_queue_by_reason(
-                &local->hw, ieee80211_ac_from_tid(tid),
-                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
-
         /* prepare A-MPDU MLME for Tx aggregation */
-        sta->ampdu_mlme.tid_tx[tid] =
-                        kmalloc(sizeof(struct tid_ampdu_tx), GFP_ATOMIC);
-        if (!sta->ampdu_mlme.tid_tx[tid]) {
+        tid_tx = kzalloc(sizeof(struct tid_ampdu_tx), GFP_ATOMIC);
+        if (!tid_tx) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 if (net_ratelimit())
                         printk(KERN_ERR "allocate tx mlme to tid %d failed\n",
                                         tid);
 #endif
                 ret = -ENOMEM;
-                goto err_wake_queue;
+                goto err_unlock_sta;
         }
 
-        skb_queue_head_init(&sta->ampdu_mlme.tid_tx[tid]->pending);
+        skb_queue_head_init(&tid_tx->pending);
+        __set_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);
 
         /* Tx timer */
-        sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer.function =
-                        sta_addba_resp_timer_expired;
-        sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer.data =
-                        (unsigned long)&sta->timer_to_tid[tid];
-        init_timer(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer);
-
-        /* Ok, the Addba frame hasn't been sent yet, but if the driver calls the
-         * call back right away, it must see that the flow has begun */
-        *state |= HT_ADDBA_REQUESTED_MSK;
-
-        start_seq_num = sta->tid_seq[tid] >> 4;
-
-        ret = drv_ampdu_action(local, sdata, IEEE80211_AMPDU_TX_START,
-                               pubsta, tid, &start_seq_num);
+        tid_tx->addba_resp_timer.function = sta_addba_resp_timer_expired;
+        tid_tx->addba_resp_timer.data = (unsigned long)&sta->timer_to_tid[tid];
+        init_timer(&tid_tx->addba_resp_timer);
 
-        if (ret) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA request denied - HW unavailable for"
-                                        " tid %d\n", tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
-                *state = HT_AGG_STATE_IDLE;
-                goto err_free;
-        }
-
-        /* Driver vetoed or OKed, but we can take packets again now */
-        ieee80211_wake_queue_by_reason(
-                &local->hw, ieee80211_ac_from_tid(tid),
-                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
-
-        spin_unlock(&local->ampdu_lock);
-
-        /* prepare tid data */
+        /* assign a dialog token */
         sta->ampdu_mlme.dialog_token_allocator++;
-        sta->ampdu_mlme.tid_tx[tid]->dialog_token =
-                        sta->ampdu_mlme.dialog_token_allocator;
-        sta->ampdu_mlme.tid_tx[tid]->ssn = start_seq_num;
+        tid_tx->dialog_token = sta->ampdu_mlme.dialog_token_allocator;
 
-        spin_unlock_bh(&sta->lock);
+        /* finally, assign it to the array */
+        rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx);
 
-        /* send AddBA request */
-        ieee80211_send_addba_request(sdata, pubsta->addr, tid,
-                         sta->ampdu_mlme.tid_tx[tid]->dialog_token,
-                         sta->ampdu_mlme.tid_tx[tid]->ssn,
-                         0x40, 5000);
-        sta->ampdu_mlme.addba_req_num[tid]++;
-        /* activate the timer for the recipient's addBA response */
-        sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer.expires =
-                                jiffies + ADDBA_RESP_INTERVAL;
-        add_timer(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer);
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "activated addBA response timer on tid %d\n", tid);
-#endif
-        return 0;
-
- err_free:
-        kfree(sta->ampdu_mlme.tid_tx[tid]);
-        sta->ampdu_mlme.tid_tx[tid] = NULL;
- err_wake_queue:
-        ieee80211_wake_queue_by_reason(
-                &local->hw, ieee80211_ac_from_tid(tid),
-                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work);
+
+        /* this flow continues off the work */
  err_unlock_sta:
-        spin_unlock(&local->ampdu_lock);
         spin_unlock_bh(&sta->lock);
         return ret;
 }
@@ -372,69 +439,65 @@ EXPORT_SYMBOL(ieee80211_start_tx_ba_session);
 
 /*
  * splice packets from the STA's pending to the local pending,
- * requires a call to ieee80211_agg_splice_finish and holding
- * local->ampdu_lock across both calls.
+ * requires a call to ieee80211_agg_splice_finish later
  */
-static void ieee80211_agg_splice_packets(struct ieee80211_local *local,
-                                         struct sta_info *sta, u16 tid)
+static void __acquires(agg_queue)
+ieee80211_agg_splice_packets(struct ieee80211_local *local,
+                             struct tid_ampdu_tx *tid_tx, u16 tid)
 {
+        int queue = ieee80211_ac_from_tid(tid);
         unsigned long flags;
-        u16 queue = ieee80211_ac_from_tid(tid);
-
-        ieee80211_stop_queue_by_reason(
-                &local->hw, queue,
-                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
 
-        if (!(sta->ampdu_mlme.tid_state_tx[tid] & HT_ADDBA_REQUESTED_MSK))
-                return;
+        ieee80211_stop_queue_agg(local, tid);
 
-        if (WARN(!sta->ampdu_mlme.tid_tx[tid],
-                 "TID %d gone but expected when splicing aggregates from"
-                 "the pending queue\n", tid))
+        if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
+                          " from the pending queue\n", tid))
                 return;
 
-        if (!skb_queue_empty(&sta->ampdu_mlme.tid_tx[tid]->pending)) {
+        if (!skb_queue_empty(&tid_tx->pending)) {
                 spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
                 /* copy over remaining packets */
-                skb_queue_splice_tail_init(
-                        &sta->ampdu_mlme.tid_tx[tid]->pending,
-                        &local->pending[queue]);
+                skb_queue_splice_tail_init(&tid_tx->pending,
+                                           &local->pending[queue]);
                 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
         }
 }
 
-static void ieee80211_agg_splice_finish(struct ieee80211_local *local,
-                                        struct sta_info *sta, u16 tid)
+static void __releases(agg_queue)
+ieee80211_agg_splice_finish(struct ieee80211_local *local, u16 tid)
 {
-        u16 queue = ieee80211_ac_from_tid(tid);
-
-        ieee80211_wake_queue_by_reason(
-                &local->hw, queue,
-                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        ieee80211_wake_queue_agg(local, tid);
 }
 
-/* caller must hold sta->lock */
 static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
                                          struct sta_info *sta, u16 tid)
 {
+        lockdep_assert_held(&sta->ampdu_mlme.mtx);
+
 #ifdef CONFIG_MAC80211_HT_DEBUG
         printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid);
 #endif
 
-        spin_lock(&local->ampdu_lock);
-        ieee80211_agg_splice_packets(local, sta, tid);
-        /*
-         * NB: we rely on sta->lock being taken in the TX
-         * processing here when adding to the pending queue,
-         * otherwise we could only change the state of the
-         * session to OPERATIONAL _here_.
-         */
-        ieee80211_agg_splice_finish(local, sta, tid);
-        spin_unlock(&local->ampdu_lock);
-
         drv_ampdu_action(local, sta->sdata,
                          IEEE80211_AMPDU_TX_OPERATIONAL,
                          &sta->sta, tid, NULL);
+
+        /*
+         * synchronize with TX path, while splicing the TX path
+         * should block so it won't put more packets onto pending.
+         */
+        spin_lock_bh(&sta->lock);
+
+        ieee80211_agg_splice_packets(local, sta->ampdu_mlme.tid_tx[tid], tid);
+        /*
+         * Now mark as operational. This will be visible
+         * in the TX path, and lets it go lock-free in
+         * the common case.
+         */
+        set_bit(HT_AGG_STATE_OPERATIONAL, &sta->ampdu_mlme.tid_tx[tid]->state);
+        ieee80211_agg_splice_finish(local, tid);
+
+        spin_unlock_bh(&sta->lock);
 }
 
 void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
@@ -442,7 +505,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
         struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
-        u8 *state;
+        struct tid_ampdu_tx *tid_tx;
 
         trace_api_start_tx_ba_cb(sdata, ra, tid);
 
@@ -454,42 +517,36 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
                 return;
         }
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
         sta = sta_info_get(sdata, ra);
         if (!sta) {
-                rcu_read_unlock();
+                mutex_unlock(&local->sta_mtx);
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "Could not find station: %pM\n", ra);
 #endif
                 return;
         }
 
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
-        spin_lock_bh(&sta->lock);
+        mutex_lock(&sta->ampdu_mlme.mtx);
+        tid_tx = sta->ampdu_mlme.tid_tx[tid];
 
-        if (WARN_ON(!(*state & HT_ADDBA_REQUESTED_MSK))) {
+        if (WARN_ON(!tid_tx)) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "addBA was not requested yet, state is %d\n",
-                                *state);
+                printk(KERN_DEBUG "addBA was not requested!\n");
 #endif
-                spin_unlock_bh(&sta->lock);
-                rcu_read_unlock();
-                return;
+                goto unlock;
         }
 
-        if (WARN_ON(*state & HT_ADDBA_DRV_READY_MSK))
-                goto out;
-
-        *state |= HT_ADDBA_DRV_READY_MSK;
+        if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state)))
+                goto unlock;
 
-        if (*state == HT_AGG_STATE_OPERATIONAL)
+        if (test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state))
                 ieee80211_agg_tx_operational(local, sta, tid);
 
- out:
-        spin_unlock_bh(&sta->lock);
-        rcu_read_unlock();
+ unlock:
+        mutex_unlock(&sta->ampdu_mlme.mtx);
+        mutex_unlock(&local->sta_mtx);
 }
-EXPORT_SYMBOL(ieee80211_start_tx_ba_cb);
 
 void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
                                       const u8 *ra, u16 tid)
@@ -510,33 +567,24 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
         ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
         memcpy(&ra_tid->ra, ra, ETH_ALEN);
         ra_tid->tid = tid;
-        ra_tid->vif = vif;
 
-        skb->pkt_type = IEEE80211_ADDBA_MSG;
-        skb_queue_tail(&local->skb_queue, skb);
-        tasklet_schedule(&local->tasklet);
+        skb->pkt_type = IEEE80211_SDATA_QUEUE_AGG_START;
+        skb_queue_tail(&sdata->skb_queue, skb);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);
 
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                    enum ieee80211_back_parties initiator)
 {
-        u8 *state;
         int ret;
 
-        /* check if the TID is in aggregation */
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
-        spin_lock_bh(&sta->lock);
-
-        if (*state != HT_AGG_STATE_OPERATIONAL) {
-                ret = -ENOENT;
-                goto unlock;
-        }
+        mutex_lock(&sta->ampdu_mlme.mtx);
 
         ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator);
 
- unlock:
-        spin_unlock_bh(&sta->lock);
+        mutex_unlock(&sta->ampdu_mlme.mtx);
+
         return ret;
 }
 
@@ -545,6 +593,8 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
         struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
         struct ieee80211_sub_if_data *sdata = sta->sdata;
         struct ieee80211_local *local = sdata->local;
+        struct tid_ampdu_tx *tid_tx;
+        int ret = 0;
 
         trace_api_stop_tx_ba_session(pubsta, tid);
 
@@ -554,7 +604,26 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
         if (tid >= STA_TID_NUM)
                 return -EINVAL;
 
-        return __ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR);
+        spin_lock_bh(&sta->lock);
+        tid_tx = sta->ampdu_mlme.tid_tx[tid];
+
+        if (!tid_tx) {
+                ret = -ENOENT;
+                goto unlock;
+        }
+
+        if (test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
+                /* already in progress stopping it */
+                ret = 0;
+                goto unlock;
+        }
+
+        set_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state);
+        ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work);
+
+ unlock:
+        spin_unlock_bh(&sta->lock);
+        return ret;
 }
 EXPORT_SYMBOL(ieee80211_stop_tx_ba_session);
 
@@ -563,7 +632,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
         struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
-        u8 *state;
+        struct tid_ampdu_tx *tid_tx;
 
         trace_api_stop_tx_ba_cb(sdata, ra, tid);
 
@@ -580,51 +649,56 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
                ra, tid);
 #endif /* CONFIG_MAC80211_HT_DEBUG */
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
+
         sta = sta_info_get(sdata, ra);
         if (!sta) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "Could not find station: %pM\n", ra);
 #endif
-                rcu_read_unlock();
-                return;
+                goto unlock;
         }
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
 
-        /* NOTE: no need to use sta->lock in this state check, as
-         * ieee80211_stop_tx_ba_session will let only one stop call to
-         * pass through per sta/tid
-         */
-        if ((*state & HT_AGG_STATE_REQ_STOP_BA_MSK) == 0) {
+        mutex_lock(&sta->ampdu_mlme.mtx);
+        spin_lock_bh(&sta->lock);
+        tid_tx = sta->ampdu_mlme.tid_tx[tid];
+
+        if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "unexpected callback to A-MPDU stop\n");
 #endif
-                rcu_read_unlock();
-                return;
+                goto unlock_sta;
         }
 
-        if (*state & HT_AGG_STATE_INITIATOR_MSK)
+        if (tid_tx->stop_initiator == WLAN_BACK_INITIATOR)
                 ieee80211_send_delba(sta->sdata, ra, tid,
                         WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);
 
-        spin_lock_bh(&sta->lock);
-        spin_lock(&local->ampdu_lock);
+        /*
+         * When we get here, the TX path will not be lockless any more wrt.
+         * aggregation, since the OPERATIONAL bit has long been cleared.
+         * Thus it will block on getting the lock, if it occurs. So if we
+         * stop the queue now, we will not get any more packets, and any
+         * that might be being processed will wait for us here, thereby
+         * guaranteeing that no packets go to the tid_tx pending queue any
+         * more.
+         */
 
-        ieee80211_agg_splice_packets(local, sta, tid);
+        ieee80211_agg_splice_packets(local, tid_tx, tid);
 
-        *state = HT_AGG_STATE_IDLE;
-        /* from now on packets are no longer put onto sta->pending */
-        kfree(sta->ampdu_mlme.tid_tx[tid]);
-        sta->ampdu_mlme.tid_tx[tid] = NULL;
+        /* future packets must not find the tid_tx struct any more */
+        rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
 
-        ieee80211_agg_splice_finish(local, sta, tid);
+        ieee80211_agg_splice_finish(local, tid);
 
-        spin_unlock(&local->ampdu_lock);
-        spin_unlock_bh(&sta->lock);
+        call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
 
-        rcu_read_unlock();
+ unlock_sta:
+        spin_unlock_bh(&sta->lock);
+        mutex_unlock(&sta->ampdu_mlme.mtx);
+ unlock:
+        mutex_unlock(&local->sta_mtx);
 }
-EXPORT_SYMBOL(ieee80211_stop_tx_ba_cb);
 
 void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
                                      const u8 *ra, u16 tid)
@@ -645,11 +719,10 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
         ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
         memcpy(&ra_tid->ra, ra, ETH_ALEN);
         ra_tid->tid = tid;
-        ra_tid->vif = vif;
 
-        skb->pkt_type = IEEE80211_DELBA_MSG;
-        skb_queue_tail(&local->skb_queue, skb);
-        tasklet_schedule(&local->tasklet);
+        skb->pkt_type = IEEE80211_SDATA_QUEUE_AGG_STOP;
+        skb_queue_tail(&sdata->skb_queue, skb);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 EXPORT_SYMBOL(ieee80211_stop_tx_ba_cb_irqsafe);
 
@@ -659,40 +732,40 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
                                   struct ieee80211_mgmt *mgmt,
                                   size_t len)
 {
+        struct tid_ampdu_tx *tid_tx;
         u16 capab, tid;
-        u8 *state;
 
         capab = le16_to_cpu(mgmt->u.action.u.addba_resp.capab);
         tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
 
-        state = &sta->ampdu_mlme.tid_state_tx[tid];
-
-        spin_lock_bh(&sta->lock);
+        mutex_lock(&sta->ampdu_mlme.mtx);
 
-        if (!(*state & HT_ADDBA_REQUESTED_MSK))
+        tid_tx = sta->ampdu_mlme.tid_tx[tid];
+        if (!tid_tx)
                 goto out;
 
-        if (mgmt->u.action.u.addba_resp.dialog_token !=
-                sta->ampdu_mlme.tid_tx[tid]->dialog_token) {
+        if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 printk(KERN_DEBUG "wrong addBA response token, tid %d\n", tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+#endif
                 goto out;
         }
 
-        del_timer(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer);
+        del_timer(&tid_tx->addba_resp_timer);
 
 #ifdef CONFIG_MAC80211_HT_DEBUG
         printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+#endif
 
         if (le16_to_cpu(mgmt->u.action.u.addba_resp.status)
                         == WLAN_STATUS_SUCCESS) {
-                u8 curstate = *state;
-
-                *state |= HT_ADDBA_RECEIVED_MSK;
+                if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED,
+                                     &tid_tx->state)) {
+                        /* ignore duplicate response */
+                        goto out;
+                }
 
-                if (*state != curstate && *state == HT_AGG_STATE_OPERATIONAL)
+                if (test_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state))
                         ieee80211_agg_tx_operational(local, sta, tid);
 
                 sta->ampdu_mlme.addba_req_num[tid] = 0;
@@ -701,5 +774,5 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
         }
 
  out:
-        spin_unlock_bh(&sta->lock);
+        mutex_unlock(&sta->ampdu_mlme.mtx);
 }
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 1f76d048388b..ed8c9f5be94f 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1446,7 +1446,6 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_conf *conf = &local->hw.conf;
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return -EOPNOTSUPP;
@@ -1455,11 +1454,11 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
                 return -EOPNOTSUPP;
 
         if (enabled == sdata->u.mgd.powersave &&
-            timeout == conf->dynamic_ps_forced_timeout)
+            timeout == local->dynamic_ps_forced_timeout)
                 return 0;
 
         sdata->u.mgd.powersave = enabled;
-        conf->dynamic_ps_forced_timeout = timeout;
+        local->dynamic_ps_forced_timeout = timeout;
 
         /* no change, but if automatic follow powersave */
         mutex_lock(&sdata->u.mgd.mtx);
@@ -1555,9 +1554,55 @@ static int ieee80211_action(struct wiphy *wiphy, struct net_device *dev,
                             bool channel_type_valid,
                             const u8 *buf, size_t len, u64 *cookie)
 {
-        return ieee80211_mgd_action(IEEE80211_DEV_TO_SUB_IF(dev), chan,
-                                    channel_type, channel_type_valid,
-                                    buf, len, cookie);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
+        struct sk_buff *skb;
+        struct sta_info *sta;
+        const struct ieee80211_mgmt *mgmt = (void *)buf;
+        u32 flags = IEEE80211_TX_INTFL_NL80211_FRAME_TX |
+                    IEEE80211_TX_CTL_REQ_TX_STATUS;
+
+        /* Check that we are on the requested channel for transmission */
+        if (chan != local->tmp_channel &&
+            chan != local->oper_channel)
+                return -EBUSY;
+        if (channel_type_valid &&
+            (channel_type != local->tmp_channel_type &&
+             channel_type != local->_oper_channel_type))
+                return -EBUSY;
+
+        switch (sdata->vif.type) {
+        case NL80211_IFTYPE_ADHOC:
+                if (mgmt->u.action.category == WLAN_CATEGORY_PUBLIC)
+                        break;
+                rcu_read_lock();
+                sta = sta_info_get(sdata, mgmt->da);
+                rcu_read_unlock();
+                if (!sta)
+                        return -ENOLINK;
+                break;
+        case NL80211_IFTYPE_STATION:
+                if (!(sdata->u.mgd.flags & IEEE80211_STA_MFP_ENABLED))
+                        flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + len);
+        if (!skb)
+                return -ENOMEM;
+        skb_reserve(skb, local->hw.extra_tx_headroom);
+
+        memcpy(skb_put(skb, len), buf, len);
+
+        IEEE80211_SKB_CB(skb)->flags = flags;
+
+        skb->dev = sdata->dev;
+        ieee80211_tx_skb(sdata, skb);
+
+        *cookie = (unsigned long) skb;
+        return 0;
 }
 
 struct cfg80211_ops mac80211_config_ops = {
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 97c9e46e859e..fa5e76e658ef 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -143,7 +143,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
                 len = p - buf;
                 break;
         case ALG_CCMP:
-                for (i = 0; i < NUM_RX_DATA_QUEUES; i++) {
+                for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++) {
                         rpn = key->u.ccmp.rx_pn[i];
                         p += scnprintf(p, sizeof(buf)+buf-p,
                                        "%02x%02x%02x%02x%02x%02x\n",
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 576e024715e3..76839d4dfaac 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -121,28 +121,25 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
         p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n",
                         sta->ampdu_mlme.dialog_token_allocator + 1);
         p += scnprintf(p, sizeof(buf) + buf - p,
-                       "TID\t\tRX active\tDTKN\tSSN\t\tTX\tDTKN\tSSN\tpending\n");
+                       "TID\t\tRX active\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");
         for (i = 0; i < STA_TID_NUM; i++) {
                 p += scnprintf(p, sizeof(buf) + buf - p, "%02d", i);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x",
-                                sta->ampdu_mlme.tid_active_rx[i]);
+                                !!sta->ampdu_mlme.tid_rx[i]);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.2x",
-                                sta->ampdu_mlme.tid_active_rx[i] ?
+                                sta->ampdu_mlme.tid_rx[i] ?
                                 sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.3x",
-                                sta->ampdu_mlme.tid_active_rx[i] ?
+                                sta->ampdu_mlme.tid_rx[i] ?
                                 sta->ampdu_mlme.tid_rx[i]->ssn : 0);
 
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x",
-                                sta->ampdu_mlme.tid_state_tx[i]);
+                                !!sta->ampdu_mlme.tid_tx[i]);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.2x",
-                                sta->ampdu_mlme.tid_state_tx[i] ?
+                                sta->ampdu_mlme.tid_tx[i] ?
                                 sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
-                p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.3x",
-                                sta->ampdu_mlme.tid_state_tx[i] ?
-                                sta->ampdu_mlme.tid_tx[i]->ssn : 0);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\t%03d",
-                                sta->ampdu_mlme.tid_state_tx[i] ?
+                                sta->ampdu_mlme.tid_tx[i] ?
                                 skb_queue_len(&sta->ampdu_mlme.tid_tx[i]->pending) : 0);
                 p += scnprintf(p, sizeof(buf) + buf - p, "\n");
         }
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 7d18a3245e3d..c33317320eee 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -16,10 +16,11 @@ static inline int drv_start(struct ieee80211_local *local)
 
         might_sleep();
 
+        trace_drv_start(local);
         local->started = true;
         smp_mb();
         ret = local->ops->start(&local->hw);
-        trace_drv_start(local, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -27,8 +28,9 @@ static inline void drv_stop(struct ieee80211_local *local)
 {
         might_sleep();
 
-        local->ops->stop(&local->hw);
         trace_drv_stop(local);
+        local->ops->stop(&local->hw);
+        trace_drv_return_void(local);
 
         /* sync away all work on the tasklet before clearing started */
         tasklet_disable(&local->tasklet);
@@ -46,8 +48,9 @@ static inline int drv_add_interface(struct ieee80211_local *local,
 
         might_sleep();
 
+        trace_drv_add_interface(local, vif_to_sdata(vif));
         ret = local->ops->add_interface(&local->hw, vif);
-        trace_drv_add_interface(local, vif_to_sdata(vif), ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -56,8 +59,9 @@ static inline void drv_remove_interface(struct ieee80211_local *local,
 {
         might_sleep();
 
-        local->ops->remove_interface(&local->hw, vif);
         trace_drv_remove_interface(local, vif_to_sdata(vif));
+        local->ops->remove_interface(&local->hw, vif);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_config(struct ieee80211_local *local, u32 changed)
@@ -66,8 +70,9 @@ static inline int drv_config(struct ieee80211_local *local, u32 changed)
 
         might_sleep();
 
+        trace_drv_config(local, changed);
         ret = local->ops->config(&local->hw, changed);
-        trace_drv_config(local, changed, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -78,26 +83,10 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
 {
         might_sleep();
 
+        trace_drv_bss_info_changed(local, sdata, info, changed);
         if (local->ops->bss_info_changed)
                 local->ops->bss_info_changed(&local->hw, &sdata->vif, info, changed);
-        trace_drv_bss_info_changed(local, sdata, info, changed);
-}
-
-struct in_ifaddr;
-static inline int drv_configure_arp_filter(struct ieee80211_local *local,
-                                           struct ieee80211_vif *vif,
-                                           struct in_ifaddr *ifa_list)
-{
-        int ret = 0;
-
-        might_sleep();
-
-        if (local->ops->configure_arp_filter)
-                ret = local->ops->configure_arp_filter(&local->hw, vif,
-                                                       ifa_list);
-
-        trace_drv_configure_arp_filter(local, vif_to_sdata(vif), ifa_list, ret);
-        return ret;
+        trace_drv_return_void(local);
 }
 
 static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
@@ -105,10 +94,12 @@ static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
 {
         u64 ret = 0;
 
+        trace_drv_prepare_multicast(local, mc_list->count);
+
         if (local->ops->prepare_multicast)
                 ret = local->ops->prepare_multicast(&local->hw, mc_list);
 
-        trace_drv_prepare_multicast(local, mc_list->count, ret);
+        trace_drv_return_u64(local, ret);
 
         return ret;
 }
@@ -120,19 +111,21 @@ static inline void drv_configure_filter(struct ieee80211_local *local,
 {
         might_sleep();
 
-        local->ops->configure_filter(&local->hw, changed_flags, total_flags,
-                                     multicast);
         trace_drv_configure_filter(local, changed_flags, total_flags,
                                    multicast);
+        local->ops->configure_filter(&local->hw, changed_flags, total_flags,
+                                     multicast);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_set_tim(struct ieee80211_local *local,
                               struct ieee80211_sta *sta, bool set)
 {
         int ret = 0;
+        trace_drv_set_tim(local, sta, set);
         if (local->ops->set_tim)
                 ret = local->ops->set_tim(&local->hw, sta, set);
-        trace_drv_set_tim(local, sta, set, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -146,8 +139,9 @@ static inline int drv_set_key(struct ieee80211_local *local,
 
         might_sleep();
 
+        trace_drv_set_key(local, cmd, sdata, sta, key);
         ret = local->ops->set_key(&local->hw, cmd, &sdata->vif, sta, key);
-        trace_drv_set_key(local, cmd, sdata, sta, key, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -162,10 +156,11 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
         if (sta)
                 ista = &sta->sta;
 
+        trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
         if (local->ops->update_tkip_key)
                 local->ops->update_tkip_key(&local->hw, &sdata->vif, conf,
                                             ista, iv32, phase1key);
-        trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_hw_scan(struct ieee80211_local *local,
@@ -176,8 +171,9 @@ static inline int drv_hw_scan(struct ieee80211_local *local,
 
         might_sleep();
 
+        trace_drv_hw_scan(local, sdata, req);
         ret = local->ops->hw_scan(&local->hw, &sdata->vif, req);
-        trace_drv_hw_scan(local, sdata, req, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -185,18 +181,20 @@ static inline void drv_sw_scan_start(struct ieee80211_local *local)
 {
         might_sleep();
 
+        trace_drv_sw_scan_start(local);
         if (local->ops->sw_scan_start)
                 local->ops->sw_scan_start(&local->hw);
-        trace_drv_sw_scan_start(local);
+        trace_drv_return_void(local);
 }
 
 static inline void drv_sw_scan_complete(struct ieee80211_local *local)
 {
         might_sleep();
 
+        trace_drv_sw_scan_complete(local);
         if (local->ops->sw_scan_complete)
                 local->ops->sw_scan_complete(&local->hw);
-        trace_drv_sw_scan_complete(local);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_get_stats(struct ieee80211_local *local,
@@ -228,9 +226,10 @@ static inline int drv_set_rts_threshold(struct ieee80211_local *local,
 
         might_sleep();
 
+        trace_drv_set_rts_threshold(local, value);
         if (local->ops->set_rts_threshold)
                 ret = local->ops->set_rts_threshold(&local->hw, value);
-        trace_drv_set_rts_threshold(local, value, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -240,12 +239,13 @@ static inline int drv_set_coverage_class(struct ieee80211_local *local,
         int ret = 0;
         might_sleep();
 
+        trace_drv_set_coverage_class(local, value);
         if (local->ops->set_coverage_class)
                 local->ops->set_coverage_class(&local->hw, value);
         else
                 ret = -EOPNOTSUPP;
 
-        trace_drv_set_coverage_class(local, value, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -254,9 +254,10 @@ static inline void drv_sta_notify(struct ieee80211_local *local,
                                   enum sta_notify_cmd cmd,
                                   struct ieee80211_sta *sta)
 {
+        trace_drv_sta_notify(local, sdata, cmd, sta);
         if (local->ops->sta_notify)
                 local->ops->sta_notify(&local->hw, &sdata->vif, cmd, sta);
-        trace_drv_sta_notify(local, sdata, cmd, sta);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_sta_add(struct ieee80211_local *local,
@@ -267,10 +268,11 @@ static inline int drv_sta_add(struct ieee80211_local *local,
 
         might_sleep();
 
+        trace_drv_sta_add(local, sdata, sta);
         if (local->ops->sta_add)
                 ret = local->ops->sta_add(&local->hw, &sdata->vif, sta);
 
-        trace_drv_sta_add(local, sdata, sta, ret);
+        trace_drv_return_int(local, ret);
 
         return ret;
 }
@@ -281,10 +283,11 @@ static inline void drv_sta_remove(struct ieee80211_local *local,
 {
         might_sleep();
 
+        trace_drv_sta_remove(local, sdata, sta);
         if (local->ops->sta_remove)
                 local->ops->sta_remove(&local->hw, &sdata->vif, sta);
 
-        trace_drv_sta_remove(local, sdata, sta);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
@@ -294,9 +297,10 @@ static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
 
         might_sleep();
 
+        trace_drv_conf_tx(local, queue, params);
         if (local->ops->conf_tx)
                 ret = local->ops->conf_tx(&local->hw, queue, params);
-        trace_drv_conf_tx(local, queue, params, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -306,9 +310,10 @@ static inline u64 drv_get_tsf(struct ieee80211_local *local)
 
         might_sleep();
 
+        trace_drv_get_tsf(local);
         if (local->ops->get_tsf)
                 ret = local->ops->get_tsf(&local->hw);
-        trace_drv_get_tsf(local, ret);
+        trace_drv_return_u64(local, ret);
         return ret;
 }
 
@@ -316,18 +321,20 @@ static inline void drv_set_tsf(struct ieee80211_local *local, u64 tsf)
 {
         might_sleep();
 
+        trace_drv_set_tsf(local, tsf);
         if (local->ops->set_tsf)
                 local->ops->set_tsf(&local->hw, tsf);
-        trace_drv_set_tsf(local, tsf);
+        trace_drv_return_void(local);
 }
 
 static inline void drv_reset_tsf(struct ieee80211_local *local)
 {
         might_sleep();
 
+        trace_drv_reset_tsf(local);
         if (local->ops->reset_tsf)
                 local->ops->reset_tsf(&local->hw);
-        trace_drv_reset_tsf(local);
+        trace_drv_return_void(local);
 }
 
 static inline int drv_tx_last_beacon(struct ieee80211_local *local)
@@ -336,9 +343,10 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local)
 
         might_sleep();
 
+        trace_drv_tx_last_beacon(local);
         if (local->ops->tx_last_beacon)
                 ret = local->ops->tx_last_beacon(&local->hw);
-        trace_drv_tx_last_beacon(local, ret);
+        trace_drv_return_int(local, ret);
         return ret;
 }
 
@@ -349,10 +357,17 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,
                                    u16 *ssn)
 {
         int ret = -EOPNOTSUPP;
+
+        might_sleep();
+
+        trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn);
+
         if (local->ops->ampdu_action)
                 ret = local->ops->ampdu_action(&local->hw, &sdata->vif, action,
                                                sta, tid, ssn);
-        trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn, ret);
+
+        trace_drv_return_int(local, ret);
+
         return ret;
 }
 
@@ -381,6 +396,7 @@ static inline void drv_flush(struct ieee80211_local *local, bool drop)
         trace_drv_flush(local, drop);
         if (local->ops->flush)
                 local->ops->flush(&local->hw, drop);
+        trace_drv_return_void(local);
 }
 
 static inline void drv_channel_switch(struct ieee80211_local *local,
@@ -388,9 +404,9 @@ static inline void drv_channel_switch(struct ieee80211_local *local,
 {
         might_sleep();
 
-        local->ops->channel_switch(&local->hw, ch_switch);
-
         trace_drv_channel_switch(local, ch_switch);
+        local->ops->channel_switch(&local->hw, ch_switch);
+        trace_drv_return_void(local);
 }
 
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 6b90630151ab..8da31caff931 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -36,20 +36,58 @@ static inline void trace_ ## name(proto) {}
  * Tracing for driver callbacks.
  */
 
-TRACE_EVENT(drv_start,
-        TP_PROTO(struct ieee80211_local *local, int ret),
+TRACE_EVENT(drv_return_void,
+        TP_PROTO(struct ieee80211_local *local),
+        TP_ARGS(local),
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+        ),
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+        ),
+        TP_printk(LOCAL_PR_FMT, LOCAL_PR_ARG)
+);
 
+TRACE_EVENT(drv_return_int,
+        TP_PROTO(struct ieee80211_local *local, int ret),
         TP_ARGS(local, ret),
-
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(int, ret)
         ),
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                __entry->ret = ret;
+        ),
+        TP_printk(LOCAL_PR_FMT " - %d", LOCAL_PR_ARG, __entry->ret)
+);
 
+TRACE_EVENT(drv_return_u64,
+        TP_PROTO(struct ieee80211_local *local, u64 ret),
+        TP_ARGS(local, ret),
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                __field(u64, ret)
+        ),
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 __entry->ret = ret;
         ),
+        TP_printk(LOCAL_PR_FMT " - %llu", LOCAL_PR_ARG, __entry->ret)
+);
+
+TRACE_EVENT(drv_start,
+        TP_PROTO(struct ieee80211_local *local),
+
+        TP_ARGS(local),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+        ),
 
         TP_printk(
                 LOCAL_PR_FMT, LOCAL_PR_ARG
@@ -76,28 +114,25 @@ TRACE_EVENT(drv_stop,
 
 TRACE_EVENT(drv_add_interface,
         TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sub_if_data *sdata,
-                 int ret),
+                 struct ieee80211_sub_if_data *sdata),
 
-        TP_ARGS(local, sdata, ret),
+        TP_ARGS(local, sdata),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 VIF_ENTRY
                 __array(char, addr, 6)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 VIF_ASSIGN;
                 memcpy(__entry->addr, sdata->vif.addr, 6);
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT  VIF_PR_FMT " addr:%pM ret:%d",
-                LOCAL_PR_ARG, VIF_PR_ARG, __entry->addr, __entry->ret
+                LOCAL_PR_FMT  VIF_PR_FMT " addr:%pM",
+                LOCAL_PR_ARG, VIF_PR_ARG, __entry->addr
         )
 );
 
@@ -126,15 +161,13 @@ TRACE_EVENT(drv_remove_interface,
 
 TRACE_EVENT(drv_config,
         TP_PROTO(struct ieee80211_local *local,
-                 u32 changed,
-                 int ret),
+                 u32 changed),
 
-        TP_ARGS(local, changed, ret),
+        TP_ARGS(local, changed),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(u32, changed)
-                __field(int, ret)
                 __field(u32, flags)
                 __field(int, power_level)
                 __field(int, dynamic_ps_timeout)
@@ -150,7 +183,6 @@ TRACE_EVENT(drv_config,
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 __entry->changed = changed;
-                __entry->ret = ret;
                 __entry->flags = local->hw.conf.flags;
                 __entry->power_level = local->hw.conf.power_level;
                 __entry->dynamic_ps_timeout = local->hw.conf.dynamic_ps_timeout;
@@ -164,8 +196,8 @@ TRACE_EVENT(drv_config,
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " ch:%#x freq:%d ret:%d",
-                LOCAL_PR_ARG, __entry->changed, __entry->center_freq, __entry->ret
+                LOCAL_PR_FMT " ch:%#x freq:%d",
+                LOCAL_PR_ARG, __entry->changed, __entry->center_freq
         )
 );
 
@@ -219,52 +251,24 @@ TRACE_EVENT(drv_bss_info_changed,
         )
 );
 
-TRACE_EVENT(drv_configure_arp_filter,
-        TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sub_if_data *sdata,
-                 struct in_ifaddr *ifa_list, int ret),
-
-        TP_ARGS(local, sdata, ifa_list, ret),
-
-        TP_STRUCT__entry(
-                LOCAL_ENTRY
-                VIF_ENTRY
-                __field(int, ret)
-        ),
-
-        TP_fast_assign(
-                LOCAL_ASSIGN;
-                VIF_ASSIGN;
-                __entry->ret = ret;
-        ),
-
-        TP_printk(
-                VIF_PR_FMT LOCAL_PR_FMT " ret:%d",
-                VIF_PR_ARG, LOCAL_PR_ARG, __entry->ret
-        )
-);
-
 TRACE_EVENT(drv_prepare_multicast,
-        TP_PROTO(struct ieee80211_local *local, int mc_count, u64 ret),
+        TP_PROTO(struct ieee80211_local *local, int mc_count),
 
-        TP_ARGS(local, mc_count, ret),
+        TP_ARGS(local, mc_count),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(int, mc_count)
-                __field(u64, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 __entry->mc_count = mc_count;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " prepare mc (%d): %llx",
-                LOCAL_PR_ARG, __entry->mc_count,
-                (unsigned long long) __entry->ret
+                LOCAL_PR_FMT " prepare mc (%d)",
+                LOCAL_PR_ARG, __entry->mc_count
         )
 );
 
@@ -298,27 +302,25 @@ TRACE_EVENT(drv_configure_filter,
 
 TRACE_EVENT(drv_set_tim,
         TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sta *sta, bool set, int ret),
+                 struct ieee80211_sta *sta, bool set),
 
-        TP_ARGS(local, sta, set, ret),
+        TP_ARGS(local, sta, set),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 STA_ENTRY
                 __field(bool, set)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 STA_ASSIGN;
                 __entry->set = set;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT STA_PR_FMT " set:%d ret:%d",
-                LOCAL_PR_ARG, STA_PR_FMT, __entry->set, __entry->ret
+                LOCAL_PR_FMT STA_PR_FMT " set:%d",
+                LOCAL_PR_ARG, STA_PR_FMT, __entry->set
         )
 );
 
@@ -326,9 +328,9 @@ TRACE_EVENT(drv_set_key,
         TP_PROTO(struct ieee80211_local *local,
                  enum set_key_cmd cmd, struct ieee80211_sub_if_data *sdata,
                  struct ieee80211_sta *sta,
-                 struct ieee80211_key_conf *key, int ret),
+                 struct ieee80211_key_conf *key),
 
-        TP_ARGS(local, cmd, sdata, sta, key, ret),
+        TP_ARGS(local, cmd, sdata, sta, key),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
@@ -338,7 +340,6 @@ TRACE_EVENT(drv_set_key,
                 __field(u8, hw_key_idx)
                 __field(u8, flags)
                 __field(s8, keyidx)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
@@ -349,12 +350,11 @@ TRACE_EVENT(drv_set_key,
                 __entry->flags = key->flags;
                 __entry->keyidx = key->keyidx;
                 __entry->hw_key_idx = key->hw_key_idx;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ret:%d",
-                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ret
+                LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT,
+                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG
         )
 );
 
@@ -389,25 +389,23 @@ TRACE_EVENT(drv_update_tkip_key,
 TRACE_EVENT(drv_hw_scan,
         TP_PROTO(struct ieee80211_local *local,
                  struct ieee80211_sub_if_data *sdata,
-                 struct cfg80211_scan_request *req, int ret),
+                 struct cfg80211_scan_request *req),
 
-        TP_ARGS(local, sdata, req, ret),
+        TP_ARGS(local, sdata, req),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 VIF_ENTRY
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 VIF_ASSIGN;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT VIF_PR_FMT " ret:%d",
-                LOCAL_PR_ARG,VIF_PR_ARG, __entry->ret
+                LOCAL_PR_FMT VIF_PR_FMT,
+                LOCAL_PR_ARG,VIF_PR_ARG
         )
 );
 
@@ -504,48 +502,44 @@ TRACE_EVENT(drv_get_tkip_seq,
 );
 
 TRACE_EVENT(drv_set_rts_threshold,
-        TP_PROTO(struct ieee80211_local *local, u32 value, int ret),
+        TP_PROTO(struct ieee80211_local *local, u32 value),
 
-        TP_ARGS(local, value, ret),
+        TP_ARGS(local, value),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(u32, value)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
-                __entry->ret = ret;
                 __entry->value = value;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " value:%d ret:%d",
-                LOCAL_PR_ARG, __entry->value, __entry->ret
+                LOCAL_PR_FMT " value:%d",
+                LOCAL_PR_ARG, __entry->value
         )
 );
 
 TRACE_EVENT(drv_set_coverage_class,
-        TP_PROTO(struct ieee80211_local *local, u8 value, int ret),
+        TP_PROTO(struct ieee80211_local *local, u8 value),
 
-        TP_ARGS(local, value, ret),
+        TP_ARGS(local, value),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(u8, value)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
-                __entry->ret = ret;
                 __entry->value = value;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " value:%d ret:%d",
-                LOCAL_PR_ARG, __entry->value, __entry->ret
+                LOCAL_PR_FMT " value:%d",
+                LOCAL_PR_ARG, __entry->value
         )
 );
 
@@ -580,27 +574,25 @@ TRACE_EVENT(drv_sta_notify,
 TRACE_EVENT(drv_sta_add,
         TP_PROTO(struct ieee80211_local *local,
                  struct ieee80211_sub_if_data *sdata,
-                 struct ieee80211_sta *sta, int ret),
+                 struct ieee80211_sta *sta),
 
-        TP_ARGS(local, sdata, sta, ret),
+        TP_ARGS(local, sdata, sta),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 VIF_ENTRY
                 STA_ENTRY
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 VIF_ASSIGN;
                 STA_ASSIGN;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ret:%d",
-                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ret
+                LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT,
+                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG
         )
 );
 
@@ -631,10 +623,9 @@ TRACE_EVENT(drv_sta_remove,
 
 TRACE_EVENT(drv_conf_tx,
         TP_PROTO(struct ieee80211_local *local, u16 queue,
-                 const struct ieee80211_tx_queue_params *params,
-                 int ret),
+                 const struct ieee80211_tx_queue_params *params),
 
-        TP_ARGS(local, queue, params, ret),
+        TP_ARGS(local, queue, params),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
@@ -643,13 +634,11 @@ TRACE_EVENT(drv_conf_tx,
                 __field(u16, cw_min)
                 __field(u16, cw_max)
                 __field(u8, aifs)
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 __entry->queue = queue;
-                __entry->ret = ret;
                 __entry->txop = params->txop;
                 __entry->cw_max = params->cw_max;
                 __entry->cw_min = params->cw_min;
@@ -657,29 +646,27 @@ TRACE_EVENT(drv_conf_tx,
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " queue:%d ret:%d",
-                LOCAL_PR_ARG, __entry->queue, __entry->ret
+                LOCAL_PR_FMT " queue:%d",
+                LOCAL_PR_ARG, __entry->queue
         )
 );
 
 TRACE_EVENT(drv_get_tsf,
-        TP_PROTO(struct ieee80211_local *local, u64 ret),
+        TP_PROTO(struct ieee80211_local *local),
 
-        TP_ARGS(local, ret),
+        TP_ARGS(local),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
-                __field(u64, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " ret:%llu",
-                LOCAL_PR_ARG, (unsigned long long)__entry->ret
+                LOCAL_PR_FMT,
+                LOCAL_PR_ARG
         )
 );
 
@@ -723,23 +710,21 @@ TRACE_EVENT(drv_reset_tsf,
 );
 
 TRACE_EVENT(drv_tx_last_beacon,
-        TP_PROTO(struct ieee80211_local *local, int ret),
+        TP_PROTO(struct ieee80211_local *local),
 
-        TP_ARGS(local, ret),
+        TP_ARGS(local),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
-                __field(int, ret)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
-                __entry->ret = ret;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " ret:%d",
-                LOCAL_PR_ARG, __entry->ret
+                LOCAL_PR_FMT,
+                LOCAL_PR_ARG
         )
 );
 
@@ -748,9 +733,9 @@ TRACE_EVENT(drv_ampdu_action,
                  struct ieee80211_sub_if_data *sdata,
                  enum ieee80211_ampdu_mlme_action action,
                  struct ieee80211_sta *sta, u16 tid,
-                 u16 *ssn, int ret),
+                 u16 *ssn),
 
-        TP_ARGS(local, sdata, action, sta, tid, ssn, ret),
+        TP_ARGS(local, sdata, action, sta, tid, ssn),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
@@ -758,7 +743,6 @@ TRACE_EVENT(drv_ampdu_action,
                 __field(u32, action)
                 __field(u16, tid)
                 __field(u16, ssn)
-                __field(int, ret)
                 VIF_ENTRY
         ),
 
@@ -766,15 +750,14 @@ TRACE_EVENT(drv_ampdu_action,
                 LOCAL_ASSIGN;
                 VIF_ASSIGN;
                 STA_ASSIGN;
-                __entry->ret = ret;
                 __entry->action = action;
                 __entry->tid = tid;
                 __entry->ssn = ssn ? *ssn : 0;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d ret:%d",
-                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid, __entry->ret
+                LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d",
+                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid
         )
 );
 
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 2ab106a0a491..be928ef7ef51 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -6,7 +6,7 @@
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
- * Copyright 2007-2008, Intel Corporation
+ * Copyright 2007-2010, Intel Corporation
  *
  * 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
@@ -105,6 +105,8 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta)
 {
         int i;
 
+        cancel_work_sync(&sta->ampdu_mlme.work);
+
         for (i = 0; i <  STA_TID_NUM; i++) {
                 __ieee80211_stop_tx_ba_session(sta, i, WLAN_BACK_INITIATOR);
                 __ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT,
@@ -112,6 +114,43 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta)
         }
 }
 
+void ieee80211_ba_session_work(struct work_struct *work)
+{
+        struct sta_info *sta =
+                container_of(work, struct sta_info, ampdu_mlme.work);
+        struct tid_ampdu_tx *tid_tx;
+        int tid;
+
+        /*
+         * When this flag is set, new sessions should be
+         * blocked, and existing sessions will be torn
+         * down by the code that set the flag, so this
+         * need not run.
+         */
+        if (test_sta_flags(sta, WLAN_STA_BLOCK_BA))
+                return;
+
+        mutex_lock(&sta->ampdu_mlme.mtx);
+        for (tid = 0; tid < STA_TID_NUM; tid++) {
+                if (test_and_clear_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired))
+                        ___ieee80211_stop_rx_ba_session(
+                                sta, tid, WLAN_BACK_RECIPIENT,
+                                WLAN_REASON_QSTA_TIMEOUT);
+
+                tid_tx = sta->ampdu_mlme.tid_tx[tid];
+                if (!tid_tx)
+                        continue;
+
+                if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state))
+                        ieee80211_tx_ba_session_handle_start(sta, tid);
+                else if (test_and_clear_bit(HT_AGG_STATE_WANT_STOP,
+                                            &tid_tx->state))
+                        ___ieee80211_stop_tx_ba_session(sta, tid,
+                                                        WLAN_BACK_INITIATOR);
+        }
+        mutex_unlock(&sta->ampdu_mlme.mtx);
+}
+
 void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
                           const u8 *da, u16 tid,
                           u16 initiator, u16 reason_code)
@@ -176,13 +215,8 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
 
         if (initiator == WLAN_BACK_INITIATOR)
                 __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0);
-        else { /* WLAN_BACK_RECIPIENT */
-                spin_lock_bh(&sta->lock);
-                if (sta->ampdu_mlme.tid_state_tx[tid] & HT_ADDBA_REQUESTED_MSK)
-                        ___ieee80211_stop_tx_ba_session(sta, tid,
-                                                        WLAN_BACK_RECIPIENT);
-                spin_unlock_bh(&sta->lock);
-        }
+        else
+                __ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_RECIPIENT);
 }
 
 int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index d7a96ced2c83..d4e84b22a66d 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -172,11 +172,13 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         rcu_assign_pointer(ifibss->presp, skb);
 
         sdata->vif.bss_conf.beacon_int = beacon_int;
+        sdata->vif.bss_conf.basic_rates = basic_rates;
         bss_change = BSS_CHANGED_BEACON_INT;
         bss_change |= ieee80211_reset_erp_info(sdata);
         bss_change |= BSS_CHANGED_BSSID;
         bss_change |= BSS_CHANGED_BEACON;
         bss_change |= BSS_CHANGED_BEACON_ENABLED;
+        bss_change |= BSS_CHANGED_BASIC_RATES;
         bss_change |= BSS_CHANGED_IBSS;
         sdata->vif.bss_conf.ibss_joined = true;
         ieee80211_bss_info_change_notify(sdata, bss_change);
@@ -529,7 +531,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
                 sdata->drop_unencrypted = 0;
 
         __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
-                                  ifibss->channel, 3, /* first two are basic */
+                                  ifibss->channel, ifibss->basic_rates,
                                   capability, 0);
 }
 
@@ -727,8 +729,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, true);
 }
 
-static void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
-                                          struct sk_buff *skb)
+void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                   struct sk_buff *skb)
 {
         struct ieee80211_rx_status *rx_status;
         struct ieee80211_mgmt *mgmt;
@@ -754,33 +756,11 @@ static void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                 ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);
                 break;
         }
-
-        kfree_skb(skb);
 }
 
-static void ieee80211_ibss_work(struct work_struct *work)
+void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
 {
-        struct ieee80211_sub_if_data *sdata =
-                container_of(work, struct ieee80211_sub_if_data, u.ibss.work);
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_if_ibss *ifibss;
-        struct sk_buff *skb;
-
-        if (WARN_ON(local->suspended))
-                return;
-
-        if (!ieee80211_sdata_running(sdata))
-                return;
-
-        if (local->scanning)
-                return;
-
-        if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_ADHOC))
-                return;
-        ifibss = &sdata->u.ibss;
-
-        while ((skb = skb_dequeue(&ifibss->skb_queue)))
-                ieee80211_ibss_rx_queued_mgmt(sdata, skb);
+        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
         if (!test_and_clear_bit(IEEE80211_IBSS_REQ_RUN, &ifibss->request))
                 return;
@@ -804,7 +784,7 @@ static void ieee80211_queue_ibss_work(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_local *local = sdata->local;
 
         set_bit(IEEE80211_IBSS_REQ_RUN, &ifibss->request);
-        ieee80211_queue_work(&local->hw, &ifibss->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 static void ieee80211_ibss_timer(unsigned long data)
@@ -827,7 +807,6 @@ void ieee80211_ibss_quiesce(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        cancel_work_sync(&ifibss->work);
         if (del_timer_sync(&ifibss->timer))
                 ifibss->timer_running = true;
 }
@@ -847,10 +826,8 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        INIT_WORK(&ifibss->work, ieee80211_ibss_work);
         setup_timer(&ifibss->timer, ieee80211_ibss_timer,
                     (unsigned long) sdata);
-        skb_queue_head_init(&ifibss->skb_queue);
 }
 
 /* scan finished notification */
@@ -872,32 +849,6 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local)
         mutex_unlock(&local->iflist_mtx);
 }
 
-ieee80211_rx_result
-ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_mgmt *mgmt;
-        u16 fc;
-
-        if (skb->len < 24)
-                return RX_DROP_MONITOR;
-
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        fc = le16_to_cpu(mgmt->frame_control);
-
-        switch (fc & IEEE80211_FCTL_STYPE) {
-        case IEEE80211_STYPE_PROBE_RESP:
-        case IEEE80211_STYPE_BEACON:
-        case IEEE80211_STYPE_PROBE_REQ:
-        case IEEE80211_STYPE_AUTH:
-                skb_queue_tail(&sdata->u.ibss.skb_queue, skb);
-                ieee80211_queue_work(&local->hw, &sdata->u.ibss.work);
-                return RX_QUEUED;
-        }
-
-        return RX_DROP_MONITOR;
-}
-
 int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
                         struct cfg80211_ibss_params *params)
 {
@@ -910,6 +861,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
                 sdata->u.ibss.fixed_bssid = false;
 
         sdata->u.ibss.privacy = params->privacy;
+        sdata->u.ibss.basic_rates = params->basic_rates;
 
         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 
@@ -957,7 +909,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
         ieee80211_recalc_idle(sdata->local);
 
         set_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
-        ieee80211_queue_work(&sdata->local->hw, &sdata->u.ibss.work);
+        ieee80211_queue_work(&sdata->local->hw, &sdata->work);
 
         return 0;
 }
@@ -965,10 +917,35 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
 {
         struct sk_buff *skb;
+        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
+        struct ieee80211_local *local = sdata->local;
+        struct cfg80211_bss *cbss;
+        u16 capability;
+        int active_ibss = 0;
+
+        active_ibss = ieee80211_sta_active_ibss(sdata);
+
+        if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
+                capability = WLAN_CAPABILITY_IBSS;
+
+                if (ifibss->privacy)
+                        capability |= WLAN_CAPABILITY_PRIVACY;
+
+                cbss = cfg80211_get_bss(local->hw.wiphy, ifibss->channel,
+                                        ifibss->bssid, ifibss->ssid,
+                                        ifibss->ssid_len, WLAN_CAPABILITY_IBSS |
+                                        WLAN_CAPABILITY_PRIVACY,
+                                        capability);
+
+                if (cbss) {
+                        cfg80211_unlink_bss(local->hw.wiphy, cbss);
+                        cfg80211_put_bss(cbss);
+                }
+        }
 
         del_timer_sync(&sdata->u.ibss.timer);
         clear_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
-        cancel_work_sync(&sdata->u.ibss.work);
+        cancel_work_sync(&sdata->work);
         clear_bit(IEEE80211_IBSS_REQ_RUN, &sdata->u.ibss.request);
 
         sta_info_flush(sdata->local, sdata);
@@ -983,7 +960,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         synchronize_rcu();
         kfree_skb(skb);
 
-        skb_queue_purge(&sdata->u.ibss.skb_queue);
+        skb_queue_purge(&sdata->skb_queue);
         memset(sdata->u.ibss.bssid, 0, ETH_ALEN);
         sdata->u.ibss.ssid_len = 0;
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 1e779e833473..6f905f153ed7 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -325,7 +325,6 @@ struct ieee80211_if_managed {
         struct timer_list conn_mon_timer;
         struct timer_list bcn_mon_timer;
         struct timer_list chswitch_timer;
-        struct work_struct work;
         struct work_struct monitor_work;
         struct work_struct chswitch_work;
         struct work_struct beacon_connection_loss_work;
@@ -340,8 +339,6 @@ struct ieee80211_if_managed {
 
         u16 aid;
 
-        struct sk_buff_head skb_queue;
-
         unsigned long timers_running; /* used for quiesce/restart */
         bool powersave; /* powersave requested for this iface */
         enum ieee80211_smps_mode req_smps, /* requested smps mode */
@@ -386,13 +383,12 @@ enum ieee80211_ibss_request {
 
 struct ieee80211_if_ibss {
         struct timer_list timer;
-        struct work_struct work;
-
-        struct sk_buff_head skb_queue;
 
         unsigned long request;
         unsigned long last_scan_completed;
 
+        u32 basic_rates;
+
         bool timer_running;
 
         bool fixed_bssid;
@@ -416,11 +412,9 @@ struct ieee80211_if_ibss {
 };
 
 struct ieee80211_if_mesh {
-        struct work_struct work;
         struct timer_list housekeeping_timer;
         struct timer_list mesh_path_timer;
         struct timer_list mesh_path_root_timer;
-        struct sk_buff_head skb_queue;
 
         unsigned long timers_running;
 
@@ -517,6 +511,11 @@ struct ieee80211_sub_if_data {
 
         u16 sequence_number;
 
+        struct work_struct work;
+        struct sk_buff_head skb_queue;
+
+        bool arp_filter_state;
+
         /*
          * AP this belongs to: self in AP mode and
          * corresponding AP in VLAN mode, NULL for
@@ -569,11 +568,15 @@ ieee80211_sdata_set_mesh_id(struct ieee80211_sub_if_data *sdata,
 #endif
 }
 
+enum sdata_queue_type {
+        IEEE80211_SDATA_QUEUE_TYPE_FRAME        = 0,
+        IEEE80211_SDATA_QUEUE_AGG_START         = 1,
+        IEEE80211_SDATA_QUEUE_AGG_STOP          = 2,
+};
+
 enum {
         IEEE80211_RX_MSG        = 1,
         IEEE80211_TX_STATUS_MSG = 2,
-        IEEE80211_DELBA_MSG     = 3,
-        IEEE80211_ADDBA_MSG     = 4,
 };
 
 enum queue_stop_reason {
@@ -724,13 +727,7 @@ struct ieee80211_local {
         struct sk_buff_head pending[IEEE80211_MAX_QUEUES];
         struct tasklet_struct tx_pending_tasklet;
 
-        /*
-         * This lock is used to prevent concurrent A-MPDU
-         * session start/stop processing, this thus also
-         * synchronises the ->ampdu_action() callback to
-         * drivers and limits it to one at a time.
-         */
-        spinlock_t ampdu_lock;
+        atomic_t agg_queue_stop[IEEE80211_MAX_QUEUES];
 
         /* number of interfaces with corresponding IFF_ flags */
         atomic_t iff_allmultis, iff_promiscs;
@@ -853,6 +850,12 @@ struct ieee80211_local {
         struct notifier_block network_latency_notifier;
         struct notifier_block ifa_notifier;
 
+        /*
+         * The dynamic ps timeout configured from user space via WEXT -
+         * this will override whatever chosen by mac80211 internally.
+         */
+        int dynamic_ps_forced_timeout;
+
         int user_power_level; /* in dBm */
         int power_constr_level; /* in dBm */
 
@@ -875,9 +878,8 @@ IEEE80211_DEV_TO_SUB_IF(struct net_device *dev)
         return netdev_priv(dev);
 }
 
-/* this struct represents 802.11n's RA/TID combination along with our vif */
+/* this struct represents 802.11n's RA/TID combination */
 struct ieee80211_ra_tid {
-        struct ieee80211_vif *vif;
         u8 ra[ETH_ALEN];
         u16 tid;
 };
@@ -986,13 +988,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
 int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
                            struct cfg80211_disassoc_request *req,
                            void *cookie);
-int ieee80211_mgd_action(struct ieee80211_sub_if_data *sdata,
-                         struct ieee80211_channel *chan,
-                         enum nl80211_channel_type channel_type,
-                         bool channel_type_valid,
-                         const u8 *buf, size_t len, u64 *cookie);
-ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,
-                                          struct sk_buff *skb);
 void ieee80211_send_pspoll(struct ieee80211_local *local,
                            struct ieee80211_sub_if_data *sdata);
 void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency);
@@ -1005,12 +1000,13 @@ void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
                                       u64 timestamp);
 void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata);
 void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);
+void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata);
+void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                  struct sk_buff *skb);
 
 /* IBSS code */
 void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);
 void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata);
-ieee80211_rx_result
-ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);
 struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
                                         u8 *bssid, u8 *addr, u32 supp_rates,
                                         gfp_t gfp);
@@ -1019,6 +1015,14 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata);
 void ieee80211_ibss_quiesce(struct ieee80211_sub_if_data *sdata);
 void ieee80211_ibss_restart(struct ieee80211_sub_if_data *sdata);
+void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata);
+void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                   struct sk_buff *skb);
+
+/* mesh code */
+void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata);
+void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                   struct sk_buff *skb);
 
 /* scan/BSS handling */
 void ieee80211_scan_work(struct work_struct *work);
@@ -1102,6 +1106,8 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
                                enum ieee80211_smps_mode smps, const u8 *da,
                                const u8 *bssid);
 
+void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
+                                     u16 initiator, u16 reason);
 void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
                                     u16 initiator, u16 reason);
 void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta);
@@ -1121,6 +1127,10 @@ int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                    enum ieee80211_back_parties initiator);
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                     enum ieee80211_back_parties initiator);
+void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
+void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
+void ieee80211_ba_session_work(struct work_struct *work);
+void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid);
 
 /* Spectrum management */
 void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 1afa9ec81fe8..910729fc18cd 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -339,7 +339,6 @@ static int ieee80211_stop(struct net_device *dev)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = sdata->local;
-        struct sta_info *sta;
         unsigned long flags;
         struct sk_buff *skb, *tmp;
         u32 hw_reconf_flags = 0;
@@ -356,18 +355,6 @@ static int ieee80211_stop(struct net_device *dev)
         ieee80211_work_purge(sdata);
 
         /*
-         * Now delete all active aggregation sessions.
-         */
-        rcu_read_lock();
-
-        list_for_each_entry_rcu(sta, &local->sta_list, list) {
-                if (sta->sdata == sdata)
-                        ieee80211_sta_tear_down_BA_sessions(sta);
-        }
-
-        rcu_read_unlock();
-
-        /*
          * Remove all stations associated with this interface.
          *
          * This must be done before calling ops->remove_interface()
@@ -473,27 +460,14 @@ static int ieee80211_stop(struct net_device *dev)
                  * whether the interface is running, which, at this point,
                  * it no longer is.
                  */
-                cancel_work_sync(&sdata->u.mgd.work);
                 cancel_work_sync(&sdata->u.mgd.chswitch_work);
                 cancel_work_sync(&sdata->u.mgd.monitor_work);
                 cancel_work_sync(&sdata->u.mgd.beacon_connection_loss_work);
 
-                /*
-                 * When we get here, the interface is marked down.
-                 * Call synchronize_rcu() to wait for the RX path
-                 * should it be using the interface and enqueuing
-                 * frames at this very time on another CPU.
-                 */
-                synchronize_rcu();
-                skb_queue_purge(&sdata->u.mgd.skb_queue);
                 /* fall through */
         case NL80211_IFTYPE_ADHOC:
-                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
                         del_timer_sync(&sdata->u.ibss.timer);
-                        cancel_work_sync(&sdata->u.ibss.work);
-                        synchronize_rcu();
-                        skb_queue_purge(&sdata->u.ibss.skb_queue);
-                }
                 /* fall through */
         case NL80211_IFTYPE_MESH_POINT:
                 if (ieee80211_vif_is_mesh(&sdata->vif)) {
@@ -508,6 +482,16 @@ static int ieee80211_stop(struct net_device *dev)
                 }
                 /* fall through */
         default:
+                flush_work(&sdata->work);
+                /*
+                 * When we get here, the interface is marked down.
+                 * Call synchronize_rcu() to wait for the RX path
+                 * should it be using the interface and enqueuing
+                 * frames at this very time on another CPU.
+                 */
+                synchronize_rcu();
+                skb_queue_purge(&sdata->skb_queue);
+
                 if (local->scan_sdata == sdata)
                         ieee80211_scan_cancel(local);
 
@@ -717,6 +701,136 @@ static void ieee80211_if_setup(struct net_device *dev)
         dev->destructor = free_netdev;
 }
 
+static void ieee80211_iface_work(struct work_struct *work)
+{
+        struct ieee80211_sub_if_data *sdata =
+                container_of(work, struct ieee80211_sub_if_data, work);
+        struct ieee80211_local *local = sdata->local;
+        struct sk_buff *skb;
+        struct sta_info *sta;
+        struct ieee80211_ra_tid *ra_tid;
+
+        if (!ieee80211_sdata_running(sdata))
+                return;
+
+        if (local->scanning)
+                return;
+
+        /*
+         * ieee80211_queue_work() should have picked up most cases,
+         * here we'll pick the rest.
+         */
+        if (WARN(local->suspended,
+                 "interface work scheduled while going to suspend\n"))
+                return;
+
+        /* first process frames */
+        while ((skb = skb_dequeue(&sdata->skb_queue))) {
+                struct ieee80211_mgmt *mgmt = (void *)skb->data;
+
+                if (skb->pkt_type == IEEE80211_SDATA_QUEUE_AGG_START) {
+                        ra_tid = (void *)&skb->cb;
+                        ieee80211_start_tx_ba_cb(&sdata->vif, ra_tid->ra,
+                                                 ra_tid->tid);
+                } else if (skb->pkt_type == IEEE80211_SDATA_QUEUE_AGG_STOP) {
+                        ra_tid = (void *)&skb->cb;
+                        ieee80211_stop_tx_ba_cb(&sdata->vif, ra_tid->ra,
+                                                ra_tid->tid);
+                } else if (ieee80211_is_action(mgmt->frame_control) &&
+                           mgmt->u.action.category == WLAN_CATEGORY_BACK) {
+                        int len = skb->len;
+
+                        mutex_lock(&local->sta_mtx);
+                        sta = sta_info_get(sdata, mgmt->sa);
+                        if (sta) {
+                                switch (mgmt->u.action.u.addba_req.action_code) {
+                                case WLAN_ACTION_ADDBA_REQ:
+                                        ieee80211_process_addba_request(
+                                                        local, sta, mgmt, len);
+                                        break;
+                                case WLAN_ACTION_ADDBA_RESP:
+                                        ieee80211_process_addba_resp(local, sta,
+                                                                     mgmt, len);
+                                        break;
+                                case WLAN_ACTION_DELBA:
+                                        ieee80211_process_delba(sdata, sta,
+                                                                mgmt, len);
+                                        break;
+                                default:
+                                        WARN_ON(1);
+                                        break;
+                                }
+                        }
+                        mutex_unlock(&local->sta_mtx);
+                } else if (ieee80211_is_data_qos(mgmt->frame_control)) {
+                        struct ieee80211_hdr *hdr = (void *)mgmt;
+                        /*
+                         * So the frame isn't mgmt, but frame_control
+                         * is at the right place anyway, of course, so
+                         * the if statement is correct.
+                         *
+                         * Warn if we have other data frame types here,
+                         * they must not get here.
+                         */
+                        WARN_ON(hdr->frame_control &
+                                        cpu_to_le16(IEEE80211_STYPE_NULLFUNC));
+                        WARN_ON(!(hdr->seq_ctrl &
+                                        cpu_to_le16(IEEE80211_SCTL_FRAG)));
+                        /*
+                         * This was a fragment of a frame, received while
+                         * a block-ack session was active. That cannot be
+                         * right, so terminate the session.
+                         */
+                        mutex_lock(&local->sta_mtx);
+                        sta = sta_info_get(sdata, mgmt->sa);
+                        if (sta) {
+                                u16 tid = *ieee80211_get_qos_ctl(hdr) &
+                                                IEEE80211_QOS_CTL_TID_MASK;
+
+                                __ieee80211_stop_rx_ba_session(
+                                        sta, tid, WLAN_BACK_RECIPIENT,
+                                        WLAN_REASON_QSTA_REQUIRE_SETUP);
+                        }
+                        mutex_unlock(&local->sta_mtx);
+                } else switch (sdata->vif.type) {
+                case NL80211_IFTYPE_STATION:
+                        ieee80211_sta_rx_queued_mgmt(sdata, skb);
+                        break;
+                case NL80211_IFTYPE_ADHOC:
+                        ieee80211_ibss_rx_queued_mgmt(sdata, skb);
+                        break;
+                case NL80211_IFTYPE_MESH_POINT:
+                        if (!ieee80211_vif_is_mesh(&sdata->vif))
+                                break;
+                        ieee80211_mesh_rx_queued_mgmt(sdata, skb);
+                        break;
+                default:
+                        WARN(1, "frame for unexpected interface type");
+                        break;
+                }
+
+                kfree_skb(skb);
+        }
+
+        /* then other type-dependent work */
+        switch (sdata->vif.type) {
+        case NL80211_IFTYPE_STATION:
+                ieee80211_sta_work(sdata);
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                ieee80211_ibss_work(sdata);
+                break;
+        case NL80211_IFTYPE_MESH_POINT:
+                if (!ieee80211_vif_is_mesh(&sdata->vif))
+                        break;
+                ieee80211_mesh_work(sdata);
+                break;
+        default:
+                break;
+        }
+}
+
+
 /*
  * Helper function to initialise an interface to a specific type.
  */
@@ -734,6 +848,9 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
         /* only monitor differs */
         sdata->dev->type = ARPHRD_ETHER;
 
+        skb_queue_head_init(&sdata->skb_queue);
+        INIT_WORK(&sdata->work, ieee80211_iface_work);
+
         switch (type) {
         case NL80211_IFTYPE_AP:
                 skb_queue_head_init(&sdata->u.ap.ps_bc_buf);
@@ -959,6 +1076,9 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
         sdata->wdev.wiphy = local->hw.wiphy;
         sdata->local = local;
         sdata->dev = ndev;
+#ifdef CONFIG_INET
+        sdata->arp_filter_state = true;
+#endif
 
         for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
                 skb_queue_head_init(&sdata->fragments[i].skb_list);
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index d0d9001a4a6a..50d1cff23d8e 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -273,7 +273,7 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
                 key->conf.iv_len = CCMP_HDR_LEN;
                 key->conf.icv_len = CCMP_MIC_LEN;
                 if (seq) {
-                        for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                        for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++)
                                 for (j = 0; j < CCMP_PN_LEN; j++)
                                         key->u.ccmp.rx_pn[i][j] =
                                                 seq[CCMP_PN_LEN - j - 1];
diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 9996e3be6e63..a3849fa3fce8 100644
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -77,7 +77,13 @@ struct ieee80211_key {
                 } tkip;
                 struct {
                         u8 tx_pn[6];
-                        u8 rx_pn[NUM_RX_DATA_QUEUES][6];
+                        /*
+                         * Last received packet number. The first
+                         * NUM_RX_DATA_QUEUES counters are used with Data
+                         * frames and the last counter is used with Robust
+                         * Management frames.
+                         */
+                        u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6];
                         struct crypto_cipher *tfm;
                         u32 replays; /* dot11RSNAStatsCCMPReplays */
                         /* scratch buffers for virt_to_page() (crypto API) */
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 88b671a16a41..edf7aff93268 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -20,6 +20,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/bitmap.h>
 #include <linux/pm_qos_params.h>
+#include <linux/inetdevice.h>
 #include <net/net_namespace.h>
 #include <net/cfg80211.h>
 
@@ -259,7 +260,6 @@ static void ieee80211_tasklet_handler(unsigned long data)
 {
         struct ieee80211_local *local = (struct ieee80211_local *) data;
         struct sk_buff *skb;
-        struct ieee80211_ra_tid *ra_tid;
 
         while ((skb = skb_dequeue(&local->skb_queue)) ||
                (skb = skb_dequeue(&local->skb_queue_unreliable))) {
@@ -274,18 +274,6 @@ static void ieee80211_tasklet_handler(unsigned long data)
                         skb->pkt_type = 0;
                         ieee80211_tx_status(local_to_hw(local), skb);
                         break;
-                case IEEE80211_DELBA_MSG:
-                        ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
-                        ieee80211_stop_tx_ba_cb(ra_tid->vif, ra_tid->ra,
-                                                ra_tid->tid);
-                        dev_kfree_skb(skb);
-                        break;
-                case IEEE80211_ADDBA_MSG:
-                        ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
-                        ieee80211_start_tx_ba_cb(ra_tid->vif, ra_tid->ra,
-                                                 ra_tid->tid);
-                        dev_kfree_skb(skb);
-                        break ;
                 default:
                         WARN(1, "mac80211: Packet is of unknown type %d\n",
                              skb->pkt_type);
@@ -330,23 +318,6 @@ static void ieee80211_recalc_smps_work(struct work_struct *work)
 }
 
 #ifdef CONFIG_INET
-int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata)
-{
-        struct in_device *idev;
-        int ret = 0;
-
-        BUG_ON(!sdata);
-        ASSERT_RTNL();
-
-        idev = sdata->dev->ip_ptr;
-        if (!idev)
-                return 0;
-
-        ret = drv_configure_arp_filter(sdata->local, &sdata->vif,
-                                       idev->ifa_list);
-        return ret;
-}
-
 static int ieee80211_ifa_changed(struct notifier_block *nb,
                                  unsigned long data, void *arg)
 {
@@ -356,8 +327,11 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
                              ifa_notifier);
         struct net_device *ndev = ifa->ifa_dev->dev;
         struct wireless_dev *wdev = ndev->ieee80211_ptr;
+        struct in_device *idev;
         struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_bss_conf *bss_conf;
         struct ieee80211_if_managed *ifmgd;
+        int c = 0;
 
         if (!netif_running(ndev))
                 return NOTIFY_DONE;
@@ -369,17 +343,44 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
         if (wdev->wiphy != local->hw.wiphy)
                 return NOTIFY_DONE;
 
-        /* We are concerned about IP addresses only when associated */
         sdata = IEEE80211_DEV_TO_SUB_IF(ndev);
+        bss_conf = &sdata->vif.bss_conf;
 
         /* ARP filtering is only supported in managed mode */
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return NOTIFY_DONE;
 
+        idev = sdata->dev->ip_ptr;
+        if (!idev)
+                return NOTIFY_DONE;
+
         ifmgd = &sdata->u.mgd;
         mutex_lock(&ifmgd->mtx);
-        if (ifmgd->associated)
-                ieee80211_set_arp_filter(sdata);
+
+        /* Copy the addresses to the bss_conf list */
+        ifa = idev->ifa_list;
+        while (c < IEEE80211_BSS_ARP_ADDR_LIST_LEN && ifa) {
+                bss_conf->arp_addr_list[c] = ifa->ifa_address;
+                ifa = ifa->ifa_next;
+                c++;
+        }
+
+        /* If not all addresses fit the list, disable filtering */
+        if (ifa) {
+                sdata->arp_filter_state = false;
+                c = 0;
+        } else {
+                sdata->arp_filter_state = true;
+        }
+        bss_conf->arp_addr_cnt = c;
+
+        /* Configure driver only if associated */
+        if (ifmgd->associated) {
+                bss_conf->arp_filter_enabled = sdata->arp_filter_state;
+                ieee80211_bss_info_change_notify(sdata,
+                                                 BSS_CHANGED_ARP_FILTER);
+        }
+
         mutex_unlock(&ifmgd->mtx);
 
         return NOTIFY_DONE;
@@ -476,8 +477,10 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         sta_info_init(local);
 
-        for (i = 0; i < IEEE80211_MAX_QUEUES; i++)
+        for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
                 skb_queue_head_init(&local->pending[i]);
+                atomic_set(&local->agg_queue_stop[i], 0);
+        }
         tasklet_init(&local->tx_pending_tasklet, ieee80211_tx_pending,
                      (unsigned long)local);
 
@@ -488,8 +491,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         skb_queue_head_init(&local->skb_queue);
         skb_queue_head_init(&local->skb_queue_unreliable);
 
-        spin_lock_init(&local->ampdu_lock);
-
         return local_to_hw(local);
 }
 EXPORT_SYMBOL(ieee80211_alloc_hw);
@@ -629,7 +630,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
         local->hw.conf.listen_interval = local->hw.max_listen_interval;
 
-        local->hw.conf.dynamic_ps_forced_timeout = -1;
+        local->dynamic_ps_forced_timeout = -1;
 
         result = sta_info_start(local);
         if (result < 0)
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index bde81031727a..c8a4f19ed13b 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -54,7 +54,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)
                 return;
         }
 
-        ieee80211_queue_work(&local->hw, &ifmsh->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 /**
@@ -345,7 +345,7 @@ static void ieee80211_mesh_path_timer(unsigned long data)
                 return;
         }
 
-        ieee80211_queue_work(&local->hw, &ifmsh->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 static void ieee80211_mesh_path_root_timer(unsigned long data)
@@ -362,7 +362,7 @@ static void ieee80211_mesh_path_root_timer(unsigned long data)
                 return;
         }
 
-        ieee80211_queue_work(&local->hw, &ifmsh->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
 void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh)
@@ -484,9 +484,6 @@ void ieee80211_mesh_quiesce(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
 
-        /* might restart the timer but that doesn't matter */
-        cancel_work_sync(&ifmsh->work);
-
         /* use atomic bitops in case both timers fire at the same time */
 
         if (del_timer_sync(&ifmsh->housekeeping_timer))
@@ -518,7 +515,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
 
         set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags);
         ieee80211_mesh_root_setup(ifmsh);
-        ieee80211_queue_work(&local->hw, &ifmsh->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
         sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |
                                                 BSS_CHANGED_BEACON_ENABLED |
@@ -536,16 +533,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
          * whether the interface is running, which, at this point,
          * it no longer is.
          */
-        cancel_work_sync(&sdata->u.mesh.work);
-
-        /*
-         * When we get here, the interface is marked down.
-         * Call synchronize_rcu() to wait for the RX path
-         * should it be using the interface and enqueuing
-         * frames at this very time on another CPU.
-         */
-        rcu_barrier(); /* Wait for RX path and call_rcu()'s */
-        skb_queue_purge(&sdata->u.mesh.skb_queue);
+        cancel_work_sync(&sdata->work);
 }
 
 static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
@@ -608,8 +596,8 @@ static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,
         }
 }
 
-static void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
-                                          struct sk_buff *skb)
+void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                   struct sk_buff *skb)
 {
         struct ieee80211_rx_status *rx_status;
         struct ieee80211_if_mesh *ifmsh;
@@ -632,26 +620,11 @@ static void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                 ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);
                 break;
         }
-
-        kfree_skb(skb);
 }
 
-static void ieee80211_mesh_work(struct work_struct *work)
+void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)
 {
-        struct ieee80211_sub_if_data *sdata =
-                container_of(work, struct ieee80211_sub_if_data, u.mesh.work);
-        struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
-        struct sk_buff *skb;
-
-        if (!ieee80211_sdata_running(sdata))
-                return;
-
-        if (local->scanning)
-                return;
-
-        while ((skb = skb_dequeue(&ifmsh->skb_queue)))
-                ieee80211_mesh_rx_queued_mgmt(sdata, skb);
 
         if (ifmsh->preq_queue_len &&
             time_after(jiffies,
@@ -678,7 +651,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
         rcu_read_lock();
         list_for_each_entry_rcu(sdata, &local->interfaces, list)
                 if (ieee80211_vif_is_mesh(&sdata->vif))
-                        ieee80211_queue_work(&local->hw, &sdata->u.mesh.work);
+                        ieee80211_queue_work(&local->hw, &sdata->work);
         rcu_read_unlock();
 }
 
@@ -686,11 +659,9 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
 
-        INIT_WORK(&ifmsh->work, ieee80211_mesh_work);
         setup_timer(&ifmsh->housekeeping_timer,
                     ieee80211_mesh_housekeeping_timer,
                     (unsigned long) sdata);
-        skb_queue_head_init(&sdata->u.mesh.skb_queue);
 
         ifmsh->mshcfg.dot11MeshRetryTimeout = MESH_RET_T;
         ifmsh->mshcfg.dot11MeshConfirmTimeout = MESH_CONF_T;
@@ -731,29 +702,3 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
         INIT_LIST_HEAD(&ifmsh->preq_queue.list);
         spin_lock_init(&ifmsh->mesh_preq_queue_lock);
 }
-
-ieee80211_rx_result
-ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
-        struct ieee80211_mgmt *mgmt;
-        u16 fc;
-
-        if (skb->len < 24)
-                return RX_DROP_MONITOR;
-
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        fc = le16_to_cpu(mgmt->frame_control);
-
-        switch (fc & IEEE80211_FCTL_STYPE) {
-        case IEEE80211_STYPE_ACTION:
-        case IEEE80211_STYPE_PROBE_RESP:
-        case IEEE80211_STYPE_BEACON:
-                skb_queue_tail(&ifmsh->skb_queue, skb);
-                ieee80211_queue_work(&local->hw, &ifmsh->work);
-                return RX_QUEUED;
-        }
-
-        return RX_CONTINUE;
-}
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index c88087f1cd0f..ebd3f1d9d889 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -237,8 +237,6 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
                 struct sta_info *stainfo, struct sk_buff *skb);
 void ieee80211s_stop(void);
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
-ieee80211_rx_result
-ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);
 void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);
 void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata);
 void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh);
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 0705018d8d1e..829e08a657d0 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -805,14 +805,14 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
         spin_unlock(&ifmsh->mesh_preq_queue_lock);
 
         if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata)))
-                ieee80211_queue_work(&sdata->local->hw, &ifmsh->work);
+                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
 
         else if (time_before(jiffies, ifmsh->last_preq)) {
                 /* avoid long wait if did not send preqs for a long time
                  * and jiffies wrapped around
                  */
                 ifmsh->last_preq = jiffies - min_preq_int_jiff(sdata) - 1;
-                ieee80211_queue_work(&sdata->local->hw, &ifmsh->work);
+                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
         } else
                 mod_timer(&ifmsh->mesh_path_timer, ifmsh->last_preq +
                                                 min_preq_int_jiff(sdata));
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 181ffd6efd81..349e466cf08b 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -315,7 +315,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
         read_unlock(&pathtbl_resize_lock);
         if (grow) {
                 set_bit(MESH_WORK_GROW_MPATH_TABLE,  &ifmsh->wrkq_flags);
-                ieee80211_queue_work(&local->hw, &ifmsh->work);
+                ieee80211_queue_work(&local->hw, &sdata->work);
         }
         return 0;
 
@@ -425,7 +425,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
         read_unlock(&pathtbl_resize_lock);
         if (grow) {
                 set_bit(MESH_WORK_GROW_MPP_TABLE,  &ifmsh->wrkq_flags);
-                ieee80211_queue_work(&local->hw, &ifmsh->work);
+                ieee80211_queue_work(&local->hw, &sdata->work);
         }
         return 0;
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 8fb85c3a043d..85c3ca33333e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -561,23 +561,19 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                 beaconint_us = ieee80211_tu_to_usec(
                                         found->vif.bss_conf.beacon_int);
 
-                timeout = local->hw.conf.dynamic_ps_forced_timeout;
+                timeout = local->dynamic_ps_forced_timeout;
                 if (timeout < 0) {
                         /*
+                         * Go to full PSM if the user configures a very low
+                         * latency requirement.
                          * The 2 second value is there for compatibility until
                          * the PM_QOS_NETWORK_LATENCY is configured with real
                          * values.
                          */
-                        if (latency == 2000000000)
-                                timeout = 100;
-                        else if (latency <= 50000)
-                                timeout = 300;
-                        else if (latency <= 100000)
-                                timeout = 100;
-                        else if (latency <= 500000)
-                                timeout = 50;
-                        else
+                        if (latency > 1900000000 && latency != 2000000000)
                                 timeout = 0;
+                        else
+                                timeout = 100;
                 }
                 local->hw.conf.dynamic_ps_timeout = timeout;
 
@@ -806,11 +802,12 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_bss *bss = (void *)cbss->priv;
         struct ieee80211_local *local = sdata->local;
+        struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
 
         bss_info_changed |= BSS_CHANGED_ASSOC;
         /* set timing information */
-        sdata->vif.bss_conf.beacon_int = cbss->beacon_interval;
-        sdata->vif.bss_conf.timestamp = cbss->tsf;
+        bss_conf->beacon_int = cbss->beacon_interval;
+        bss_conf->timestamp = cbss->tsf;
 
         bss_info_changed |= BSS_CHANGED_BEACON_INT;
         bss_info_changed |= ieee80211_handle_bss_capability(sdata,
@@ -835,7 +832,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_led_assoc(local, 1);
 
-        sdata->vif.bss_conf.assoc = 1;
+        bss_conf->assoc = 1;
         /*
          * For now just always ask the driver to update the basic rateset
          * when we have associated, we aren't checking whether it actually
@@ -848,9 +845,15 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         /* Tell the driver to monitor connection quality (if supported) */
         if ((local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI) &&
-            sdata->vif.bss_conf.cqm_rssi_thold)
+            bss_conf->cqm_rssi_thold)
                 bss_info_changed |= BSS_CHANGED_CQM;
 
+        /* Enable ARP filtering */
+        if (bss_conf->arp_filter_enabled != sdata->arp_filter_state) {
+                bss_conf->arp_filter_enabled = sdata->arp_filter_state;
+                bss_info_changed |= BSS_CHANGED_ARP_FILTER;
+        }
+
         ieee80211_bss_info_change_notify(sdata, bss_info_changed);
 
         mutex_lock(&local->iflist_mtx);
@@ -898,13 +901,13 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         netif_tx_stop_all_queues(sdata->dev);
         netif_carrier_off(sdata->dev);
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
         sta = sta_info_get(sdata, bssid);
         if (sta) {
-                set_sta_flags(sta, WLAN_STA_DISASSOC);
+                set_sta_flags(sta, WLAN_STA_BLOCK_BA);
                 ieee80211_sta_tear_down_BA_sessions(sta);
         }
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         changed |= ieee80211_reset_erp_info(sdata);
 
@@ -932,6 +935,12 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_hw_config(local, config_changed);
 
+        /* Disable ARP filtering */
+        if (sdata->vif.bss_conf.arp_filter_enabled) {
+                sdata->vif.bss_conf.arp_filter_enabled = false;
+                changed |= BSS_CHANGED_ARP_FILTER;
+        }
+
         /* The BSSID (not really interesting) and HT changed */
         changed |= BSS_CHANGED_BSSID | BSS_CHANGED_HT;
         ieee80211_bss_info_change_notify(sdata, changed);
@@ -1633,35 +1642,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         ieee80211_bss_info_change_notify(sdata, changed);
 }
 
-ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,
-                                          struct sk_buff *skb)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_mgmt *mgmt;
-        u16 fc;
-
-        if (skb->len < 24)
-                return RX_DROP_MONITOR;
-
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        fc = le16_to_cpu(mgmt->frame_control);
-
-        switch (fc & IEEE80211_FCTL_STYPE) {
-        case IEEE80211_STYPE_PROBE_RESP:
-        case IEEE80211_STYPE_BEACON:
-        case IEEE80211_STYPE_DEAUTH:
-        case IEEE80211_STYPE_DISASSOC:
-        case IEEE80211_STYPE_ACTION:
-                skb_queue_tail(&sdata->u.mgd.skb_queue, skb);
-                ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
-                return RX_QUEUED;
-        }
-
-        return RX_DROP_MONITOR;
-}
-
-static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
-                                         struct sk_buff *skb)
+void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                  struct sk_buff *skb)
 {
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         struct ieee80211_rx_status *rx_status;
@@ -1693,44 +1675,6 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                         break;
                 case IEEE80211_STYPE_ACTION:
                         switch (mgmt->u.action.category) {
-                        case WLAN_CATEGORY_BACK: {
-                                struct ieee80211_local *local = sdata->local;
-                                int len = skb->len;
-                                struct sta_info *sta;
-
-                                rcu_read_lock();
-                                sta = sta_info_get(sdata, mgmt->sa);
-                                if (!sta) {
-                                        rcu_read_unlock();
-                                        break;
-                                }
-
-                                local_bh_disable();
-
-                                switch (mgmt->u.action.u.addba_req.action_code) {
-                                case WLAN_ACTION_ADDBA_REQ:
-                                        if (len < (IEEE80211_MIN_ACTION_SIZE +
-                                                   sizeof(mgmt->u.action.u.addba_req)))
-                                                break;
-                                        ieee80211_process_addba_request(local, sta, mgmt, len);
-                                        break;
-                                case WLAN_ACTION_ADDBA_RESP:
-                                        if (len < (IEEE80211_MIN_ACTION_SIZE +
-                                                   sizeof(mgmt->u.action.u.addba_resp)))
-                                                break;
-                                        ieee80211_process_addba_resp(local, sta, mgmt, len);
-                                        break;
-                                case WLAN_ACTION_DELBA:
-                                        if (len < (IEEE80211_MIN_ACTION_SIZE +
-                                                   sizeof(mgmt->u.action.u.delba)))
-                                                break;
-                                        ieee80211_process_delba(sdata, sta, mgmt, len);
-                                        break;
-                                }
-                                local_bh_enable();
-                                rcu_read_unlock();
-                                break;
-                                }
                         case WLAN_CATEGORY_SPECTRUM_MGMT:
                                 ieee80211_sta_process_chanswitch(sdata,
                                                 &mgmt->u.action.u.chan_switch.sw_elem,
@@ -1754,7 +1698,7 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                 default:
                         WARN(1, "unexpected: %d", rma);
                 }
-                goto out;
+                return;
         }
 
         mutex_unlock(&ifmgd->mtx);
@@ -1799,8 +1743,6 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 
                 cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
         }
- out:
-        kfree_skb(skb);
 }
 
 static void ieee80211_sta_timer(unsigned long data)
@@ -1815,39 +1757,13 @@ static void ieee80211_sta_timer(unsigned long data)
                 return;
         }
 
-        ieee80211_queue_work(&local->hw, &ifmgd->work);
+        ieee80211_queue_work(&local->hw, &sdata->work);
 }
 
-static void ieee80211_sta_work(struct work_struct *work)
+void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
 {
-        struct ieee80211_sub_if_data *sdata =
-                container_of(work, struct ieee80211_sub_if_data, u.mgd.work);
         struct ieee80211_local *local = sdata->local;
-        struct ieee80211_if_managed *ifmgd;
-        struct sk_buff *skb;
-
-        if (!ieee80211_sdata_running(sdata))
-                return;
-
-        if (local->scanning)
-                return;
-
-        if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))
-                return;
-
-        /*
-         * ieee80211_queue_work() should have picked up most cases,
-         * here we'll pick the rest.
-         */
-        if (WARN(local->suspended, "STA MLME work scheduled while "
-                 "going to suspend\n"))
-                return;
-
-        ifmgd = &sdata->u.mgd;
-
-        /* first process frames to avoid timing out while a frame is pending */
-        while ((skb = skb_dequeue(&ifmgd->skb_queue)))
-                ieee80211_sta_rx_queued_mgmt(sdata, skb);
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
         /* then process the rest of the work */
         mutex_lock(&ifmgd->mtx);
@@ -1942,8 +1858,7 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
                 ieee80211_queue_work(&sdata->local->hw,
                            &sdata->u.mgd.monitor_work);
                 /* and do all the other regular work too */
-                ieee80211_queue_work(&sdata->local->hw,
-                           &sdata->u.mgd.work);
+                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
         }
 }
 
@@ -1958,7 +1873,6 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
          * time -- the code here is properly synchronised.
          */
 
-        cancel_work_sync(&ifmgd->work);
         cancel_work_sync(&ifmgd->beacon_connection_loss_work);
         if (del_timer_sync(&ifmgd->timer))
                 set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
@@ -1990,7 +1904,6 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_if_managed *ifmgd;
 
         ifmgd = &sdata->u.mgd;
-        INIT_WORK(&ifmgd->work, ieee80211_sta_work);
         INIT_WORK(&ifmgd->monitor_work, ieee80211_sta_monitor_work);
         INIT_WORK(&ifmgd->chswitch_work, ieee80211_chswitch_work);
         INIT_WORK(&ifmgd->beacon_connection_loss_work,
@@ -2003,7 +1916,6 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
                     (unsigned long) sdata);
         setup_timer(&ifmgd->chswitch_timer, ieee80211_chswitch_timer,
                     (unsigned long) sdata);
-        skb_queue_head_init(&ifmgd->skb_queue);
 
         ifmgd->flags = 0;
 
@@ -2152,18 +2064,9 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
                         cfg80211_send_assoc_timeout(wk->sdata->dev,
                                                     wk->filter_ta);
                         return WORK_DONE_DESTROY;
-                } else {
-                        mutex_unlock(&wk->sdata->u.mgd.mtx);
-#ifdef CONFIG_INET
-                        /*
-                         * configure ARP filter IP addresses to the driver,
-                         * intentionally outside the mgd mutex.
-                         */
-                        rtnl_lock();
-                        ieee80211_set_arp_filter(wk->sdata);
-                        rtnl_unlock();
-#endif
                 }
+
+                mutex_unlock(&wk->sdata->u.mgd.mtx);
         }
 
         cfg80211_send_rx_assoc(wk->sdata->dev, skb->data, skb->len);
@@ -2292,14 +2195,16 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         struct ieee80211_work *wk;
-        const u8 *bssid = req->bss->bssid;
+        u8 bssid[ETH_ALEN];
+        bool assoc_bss = false;
 
         mutex_lock(&ifmgd->mtx);
 
+        memcpy(bssid, req->bss->bssid, ETH_ALEN);
         if (ifmgd->associated == req->bss) {
-                bssid = req->bss->bssid;
-                ieee80211_set_disassoc(sdata, true);
+                ieee80211_set_disassoc(sdata, false);
                 mutex_unlock(&ifmgd->mtx);
+                assoc_bss = true;
         } else {
                 bool not_auth_yet = false;
 
@@ -2345,6 +2250,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
         ieee80211_send_deauth_disassoc(sdata, bssid, IEEE80211_STYPE_DEAUTH,
                                        req->reason_code, cookie,
                                        !req->local_state_change);
+        if (assoc_bss)
+                sta_info_destroy_addr(sdata, bssid);
 
         ieee80211_recalc_idle(sdata->local);
 
@@ -2389,44 +2296,6 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
         return 0;
 }
 
-int ieee80211_mgd_action(struct ieee80211_sub_if_data *sdata,
-                         struct ieee80211_channel *chan,
-                         enum nl80211_channel_type channel_type,
-                         bool channel_type_valid,
-                         const u8 *buf, size_t len, u64 *cookie)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-        struct sk_buff *skb;
-
-        /* Check that we are on the requested channel for transmission */
-        if (chan != local->tmp_channel &&
-            chan != local->oper_channel)
-                return -EBUSY;
-        if (channel_type_valid &&
-            (channel_type != local->tmp_channel_type &&
-             channel_type != local->_oper_channel_type))
-                return -EBUSY;
-
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom + len);
-        if (!skb)
-                return -ENOMEM;
-        skb_reserve(skb, local->hw.extra_tx_headroom);
-
-        memcpy(skb_put(skb, len), buf, len);
-
-        if (!(ifmgd->flags & IEEE80211_STA_MFP_ENABLED))
-                IEEE80211_SKB_CB(skb)->flags |=
-                        IEEE80211_TX_INTFL_DONT_ENCRYPT;
-        IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_NL80211_FRAME_TX |
-                IEEE80211_TX_CTL_REQ_TX_STATUS;
-        skb->dev = sdata->dev;
-        ieee80211_tx_skb(sdata, skb);
-
-        *cookie = (unsigned long) skb;
-        return 0;
-}
-
 void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
                                enum nl80211_cqm_rssi_threshold_event rssi_event,
                                gfp_t gfp)
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 75202b295a4e..d287fde0431d 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -40,22 +40,14 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
         list_for_each_entry(sdata, &local->interfaces, list)
                 ieee80211_disable_keys(sdata);
 
-        /* Tear down aggregation sessions */
-
-        rcu_read_lock();
-
-        if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
-                list_for_each_entry_rcu(sta, &local->sta_list, list) {
+        /* tear down aggregation sessions and remove STAs */
+        mutex_lock(&local->sta_mtx);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
                         set_sta_flags(sta, WLAN_STA_BLOCK_BA);
                         ieee80211_sta_tear_down_BA_sessions(sta);
                 }
-        }
 
-        rcu_read_unlock();
-
-        /* remove STAs */
-        mutex_lock(&local->sta_mtx);
-        list_for_each_entry(sta, &local->sta_list, list) {
                 if (sta->uploaded) {
                         sdata = sta->sdata;
                         if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
@@ -72,6 +64,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
 
         /* remove all interfaces */
         list_for_each_entry(sdata, &local->interfaces, list) {
+                cancel_work_sync(&sdata->work);
+
                 switch(sdata->vif.type) {
                 case NL80211_IFTYPE_STATION:
                         ieee80211_sta_quiesce(sdata);
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index c23f08251da4..7a04951fcb1f 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -365,7 +365,7 @@ minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, stru
                 return;
 
         tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
-        if (likely(sta->ampdu_mlme.tid_state_tx[tid] != HT_AGG_STATE_IDLE))
+        if (likely(sta->ampdu_mlme.tid_tx[tid]))
                 return;
 
         ieee80211_start_tx_ba_session(pubsta, tid);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6a15632e7eca..a8aa0f2411a2 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -719,16 +719,13 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx,
 
         tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
 
-        spin_lock(&sta->lock);
-
-        if (!sta->ampdu_mlme.tid_active_rx[tid])
-                goto dont_reorder_unlock;
-
-        tid_agg_rx = sta->ampdu_mlme.tid_rx[tid];
+        tid_agg_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
+        if (!tid_agg_rx)
+                goto dont_reorder;
 
         /* qos null data frames are excluded */
         if (unlikely(hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_NULLFUNC)))
-                goto dont_reorder_unlock;
+                goto dont_reorder;
 
         /* new, potentially un-ordered, ampdu frame - process it */
 
@@ -740,20 +737,22 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx,
         /* if this mpdu is fragmented - terminate rx aggregation session */
         sc = le16_to_cpu(hdr->seq_ctrl);
         if (sc & IEEE80211_SCTL_FRAG) {
-                spin_unlock(&sta->lock);
-                __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
-                                               WLAN_REASON_QSTA_REQUIRE_SETUP);
-                dev_kfree_skb(skb);
+                skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
+                skb_queue_tail(&rx->sdata->skb_queue, skb);
+                ieee80211_queue_work(&local->hw, &rx->sdata->work);
                 return;
         }
 
-        if (ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb, frames)) {
-                spin_unlock(&sta->lock);
+        /*
+         * No locking needed -- we will only ever process one
+         * RX packet at a time, and thus own tid_agg_rx. All
+         * other code manipulating it needs to (and does) make
+         * sure that we cannot get to it any more before doing
+         * anything with it.
+         */
+        if (ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb, frames))
                 return;
-        }
 
- dont_reorder_unlock:
-        spin_unlock(&sta->lock);
  dont_reorder:
         __skb_queue_tail(frames, skb);
 }
@@ -1268,11 +1267,13 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
                                                  rx->queue, &(rx->skb));
                 if (rx->key && rx->key->conf.alg == ALG_CCMP &&
                     ieee80211_has_protected(fc)) {
+                        int queue = ieee80211_is_mgmt(fc) ?
+                                NUM_RX_DATA_QUEUES : rx->queue;
                         /* Store CCMP PN so that we can verify that the next
                          * fragment has a sequential PN value. */
                         entry->ccmp = 1;
                         memcpy(entry->last_pn,
-                               rx->key->u.ccmp.rx_pn[rx->queue],
+                               rx->key->u.ccmp.rx_pn[queue],
                                CCMP_PN_LEN);
                 }
                 return RX_QUEUED;
@@ -1292,6 +1293,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
         if (entry->ccmp) {
                 int i;
                 u8 pn[CCMP_PN_LEN], *rpn;
+                int queue;
                 if (!rx->key || rx->key->conf.alg != ALG_CCMP)
                         return RX_DROP_UNUSABLE;
                 memcpy(pn, entry->last_pn, CCMP_PN_LEN);
@@ -1300,7 +1302,9 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
                         if (pn[i])
                                 break;
                 }
-                rpn = rx->key->u.ccmp.rx_pn[rx->queue];
+                queue = ieee80211_is_mgmt(fc) ?
+                        NUM_RX_DATA_QUEUES : rx->queue;
+                rpn = rx->key->u.ccmp.rx_pn[queue];
                 if (memcmp(pn, rpn, CCMP_PN_LEN))
                         return RX_DROP_UNUSABLE;
                 memcpy(entry->last_pn, pn, CCMP_PN_LEN);
@@ -1830,13 +1834,11 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
                                   &bar_data, sizeof(bar_data)))
                         return RX_DROP_MONITOR;
 
-                spin_lock(&rx->sta->lock);
                 tid = le16_to_cpu(bar_data.control) >> 12;
-                if (!rx->sta->ampdu_mlme.tid_active_rx[tid]) {
-                        spin_unlock(&rx->sta->lock);
+
+                tid_agg_rx = rcu_dereference(rx->sta->ampdu_mlme.tid_rx[tid]);
+                if (!tid_agg_rx)
                         return RX_DROP_MONITOR;
-                }
-                tid_agg_rx = rx->sta->ampdu_mlme.tid_rx[tid];
 
                 start_seq_num = le16_to_cpu(bar_data.start_seq_num) >> 4;
 
@@ -1849,7 +1851,6 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
                 ieee80211_release_reorder_frames(hw, tid_agg_rx, start_seq_num,
                                                  frames);
                 kfree_skb(skb);
-                spin_unlock(&rx->sta->lock);
                 return RX_QUEUED;
         }
 
@@ -1950,30 +1951,27 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                 if (len < IEEE80211_MIN_ACTION_SIZE + 1)
                         break;
 
-                if (sdata->vif.type == NL80211_IFTYPE_STATION)
-                        return ieee80211_sta_rx_mgmt(sdata, rx->skb);
-
                 switch (mgmt->u.action.u.addba_req.action_code) {
                 case WLAN_ACTION_ADDBA_REQ:
                         if (len < (IEEE80211_MIN_ACTION_SIZE +
                                    sizeof(mgmt->u.action.u.addba_req)))
-                                return RX_DROP_MONITOR;
-                        ieee80211_process_addba_request(local, rx->sta, mgmt, len);
-                        goto handled;
+                                goto invalid;
+                        break;
                 case WLAN_ACTION_ADDBA_RESP:
                         if (len < (IEEE80211_MIN_ACTION_SIZE +
                                    sizeof(mgmt->u.action.u.addba_resp)))
-                                break;
-                        ieee80211_process_addba_resp(local, rx->sta, mgmt, len);
-                        goto handled;
+                                goto invalid;
+                        break;
                 case WLAN_ACTION_DELBA:
                         if (len < (IEEE80211_MIN_ACTION_SIZE +
                                    sizeof(mgmt->u.action.u.delba)))
-                                break;
-                        ieee80211_process_delba(sdata, rx->sta, mgmt, len);
-                        goto handled;
+                                goto invalid;
+                        break;
+                default:
+                        goto invalid;
                 }
-                break;
+
+                goto queue;
         case WLAN_CATEGORY_SPECTRUM_MGMT:
                 if (local->hw.conf.channel->band != IEEE80211_BAND_5GHZ)
                         break;
@@ -2003,7 +2001,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                         if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
                                 break;
 
-                        return ieee80211_sta_rx_mgmt(sdata, rx->skb);
+                        goto queue;
                 }
                 break;
         case WLAN_CATEGORY_SA_QUERY:
@@ -2021,11 +2019,12 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                 break;
         case WLAN_CATEGORY_MESH_PLINK:
         case WLAN_CATEGORY_MESH_PATH_SEL:
-                if (ieee80211_vif_is_mesh(&sdata->vif))
-                        return ieee80211_mesh_rx_mgmt(sdata, rx->skb);
-                break;
+                if (!ieee80211_vif_is_mesh(&sdata->vif))
+                        break;
+                goto queue;
         }
 
+ invalid:
         /*
          * For AP mode, hostapd is responsible for handling any action
          * frames that we didn't handle, including returning unknown
@@ -2045,8 +2044,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
          */
         status = IEEE80211_SKB_RXCB(rx->skb);
 
-        if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-            cfg80211_rx_action(rx->sdata->dev, status->freq,
+        if (cfg80211_rx_action(rx->sdata->dev, status->freq,
                                rx->skb->data, rx->skb->len,
                                GFP_ATOMIC))
                 goto handled;
@@ -2074,6 +2072,14 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                 rx->sta->rx_packets++;
         dev_kfree_skb(rx->skb);
         return RX_QUEUED;
+
+ queue:
+        rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
+        skb_queue_tail(&sdata->skb_queue, rx->skb);
+        ieee80211_queue_work(&local->hw, &sdata->work);
+        if (rx->sta)
+                rx->sta->rx_packets++;
+        return RX_QUEUED;
 }
 
 static ieee80211_rx_result debug_noinline
@@ -2081,10 +2087,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
 {
         struct ieee80211_sub_if_data *sdata = rx->sdata;
         ieee80211_rx_result rxs;
+        struct ieee80211_mgmt *mgmt = (void *)rx->skb->data;
+        __le16 stype;
 
         if (!(rx->flags & IEEE80211_RX_RA_MATCH))
                 return RX_DROP_MONITOR;
 
+        if (rx->skb->len < 24)
+                return RX_DROP_MONITOR;
+
         if (ieee80211_drop_unencrypted_mgmt(rx))
                 return RX_DROP_UNUSABLE;
 
@@ -2092,16 +2103,42 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
         if (rxs != RX_CONTINUE)
                 return rxs;
 
-        if (ieee80211_vif_is_mesh(&sdata->vif))
-                return ieee80211_mesh_rx_mgmt(sdata, rx->skb);
+        stype = mgmt->frame_control & cpu_to_le16(IEEE80211_FCTL_STYPE);
 
-        if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-                return ieee80211_ibss_rx_mgmt(sdata, rx->skb);
+        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+            sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+            sdata->vif.type != NL80211_IFTYPE_STATION)
+                return RX_DROP_MONITOR;
+
+        switch (stype) {
+        case cpu_to_le16(IEEE80211_STYPE_BEACON):
+        case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
+                /* process for all: mesh, mlme, ibss */
+                break;
+        case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+        case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+                /* process only for station */
+                if (sdata->vif.type != NL80211_IFTYPE_STATION)
+                        return RX_DROP_MONITOR;
+                break;
+        case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
+        case cpu_to_le16(IEEE80211_STYPE_AUTH):
+                /* process only for ibss */
+                if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
+                        return RX_DROP_MONITOR;
+                break;
+        default:
+                return RX_DROP_MONITOR;
+        }
 
-        if (sdata->vif.type == NL80211_IFTYPE_STATION)
-                return ieee80211_sta_rx_mgmt(sdata, rx->skb);
+        /* queue up frame and kick off work to process it */
+        rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
+        skb_queue_tail(&sdata->skb_queue, rx->skb);
+        ieee80211_queue_work(&rx->local->hw, &sdata->work);
+        if (rx->sta)
+                rx->sta->rx_packets++;
 
-        return RX_DROP_MONITOR;
+        return RX_QUEUED;
 }
 
 static void ieee80211_rx_michael_mic_report(struct ieee80211_hdr *hdr,
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 4607da9a6ff7..67656cbf2b15 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -235,6 +235,8 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
         spin_lock_init(&sta->lock);
         spin_lock_init(&sta->flaglock);
         INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
+        INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
+        mutex_init(&sta->ampdu_mlme.mtx);
 
         memcpy(sta->sta.addr, addr, ETH_ALEN);
         sta->local = local;
@@ -246,14 +248,12 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
         }
 
         for (i = 0; i < STA_TID_NUM; i++) {
-                /* timer_to_tid must be initialized with identity mapping to
-                 * enable session_timer's data differentiation. refer to
-                 * sta_rx_agg_session_timer_expired for useage */
+                /*
+                 * timer_to_tid must be initialized with identity mapping
+                 * to enable session_timer's data differentiation. See
+                 * sta_rx_agg_session_timer_expired for usage.
+                 */
                 sta->timer_to_tid[i] = i;
-                /* tx */
-                sta->ampdu_mlme.tid_state_tx[i] = HT_AGG_STATE_IDLE;
-                sta->ampdu_mlme.tid_tx[i] = NULL;
-                sta->ampdu_mlme.addba_req_num[i] = 0;
         }
         skb_queue_head_init(&sta->ps_tx_buf);
         skb_queue_head_init(&sta->tx_filtered);
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 813da34db733..10d0fcb417ae 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -42,9 +42,6 @@
  *      be in the queues
  * @WLAN_STA_PSPOLL: Station sent PS-poll while driver was keeping
  *      station in power-save mode, reply when the driver unblocks.
- * @WLAN_STA_DISASSOC: Disassociation in progress.
- *      This is used to reject TX BA session requests when disassociation
- *      is in progress.
  */
 enum ieee80211_sta_info_flags {
         WLAN_STA_AUTH           = 1<<0,
@@ -60,38 +57,44 @@ enum ieee80211_sta_info_flags {
         WLAN_STA_BLOCK_BA       = 1<<11,
         WLAN_STA_PS_DRIVER      = 1<<12,
         WLAN_STA_PSPOLL         = 1<<13,
-        WLAN_STA_DISASSOC       = 1<<14,
 };
 
 #define STA_TID_NUM 16
 #define ADDBA_RESP_INTERVAL HZ
-#define HT_AGG_MAX_RETRIES              (0x3)
+#define HT_AGG_MAX_RETRIES              0x3
 
-#define HT_AGG_STATE_INITIATOR_SHIFT    (4)
-
-#define HT_ADDBA_REQUESTED_MSK          BIT(0)
-#define HT_ADDBA_DRV_READY_MSK          BIT(1)
-#define HT_ADDBA_RECEIVED_MSK           BIT(2)
-#define HT_AGG_STATE_REQ_STOP_BA_MSK    BIT(3)
-#define HT_AGG_STATE_INITIATOR_MSK      BIT(HT_AGG_STATE_INITIATOR_SHIFT)
-#define HT_AGG_STATE_IDLE               (0x0)
-#define HT_AGG_STATE_OPERATIONAL        (HT_ADDBA_REQUESTED_MSK |       \
-                                         HT_ADDBA_DRV_READY_MSK |       \
-                                         HT_ADDBA_RECEIVED_MSK)
+#define HT_AGG_STATE_DRV_READY          0
+#define HT_AGG_STATE_RESPONSE_RECEIVED  1
+#define HT_AGG_STATE_OPERATIONAL        2
+#define HT_AGG_STATE_STOPPING           3
+#define HT_AGG_STATE_WANT_START         4
+#define HT_AGG_STATE_WANT_STOP          5
 
 /**
  * struct tid_ampdu_tx - TID aggregation information (Tx).
  *
+ * @rcu_head: rcu head for freeing structure
  * @addba_resp_timer: timer for peer's response to addba request
  * @pending: pending frames queue -- use sta's spinlock to protect
- * @ssn: Starting Sequence Number expected to be aggregated.
  * @dialog_token: dialog token for aggregation session
+ * @state: session state (see above)
+ * @stop_initiator: initiator of a session stop
+ *
+ * This structure is protected by RCU and the per-station
+ * spinlock. Assignments to the array holding it must hold
+ * the spinlock, only the TX path can access it under RCU
+ * lock-free if, and only if, the state has  the flag
+ * %HT_AGG_STATE_OPERATIONAL set. Otherwise, the TX path
+ * must also acquire the spinlock and re-check the state,
+ * see comments in the tx code touching it.
  */
 struct tid_ampdu_tx {
+        struct rcu_head rcu_head;
         struct timer_list addba_resp_timer;
         struct sk_buff_head pending;
-        u16 ssn;
+        unsigned long state;
         u8 dialog_token;
+        u8 stop_initiator;
 };
 
 /**
@@ -106,8 +109,18 @@ struct tid_ampdu_tx {
  * @buf_size: buffer size for incoming A-MPDUs
  * @timeout: reset timer value (in TUs).
  * @dialog_token: dialog token for aggregation session
+ * @rcu_head: RCU head used for freeing this struct
+ *
+ * This structure is protected by RCU and the per-station
+ * spinlock. Assignments to the array holding it must hold
+ * the spinlock, only the RX path can access it under RCU
+ * lock-free. The RX path, since it is single-threaded,
+ * can even modify the structure without locking since the
+ * only other modifications to it are done when the struct
+ * can not yet or no longer be found by the RX path.
  */
 struct tid_ampdu_rx {
+        struct rcu_head rcu_head;
         struct sk_buff **reorder_buf;
         unsigned long *reorder_time;
         struct timer_list session_timer;
@@ -122,19 +135,23 @@ struct tid_ampdu_rx {
 /**
  * struct sta_ampdu_mlme - STA aggregation information.
  *
- * @tid_active_rx: TID's state in Rx session state machine.
- * @tid_rx: aggregation info for Rx per TID
- * @tid_state_tx: TID's state in Tx session state machine.
+ * @tid_rx: aggregation info for Rx per TID -- RCU protected
  * @tid_tx: aggregation info for Tx per TID
  * @addba_req_num: number of times addBA request has been sent.
  * @dialog_token_allocator: dialog token enumerator for each new session;
+ * @work: work struct for starting/stopping aggregation
+ * @tid_rx_timer_expired: bitmap indicating on which TIDs the
+ *      RX timer expired until the work for it runs
+ * @mtx: mutex to protect all TX data (except non-NULL assignments
+ *      to tid_tx[idx], which are protected by the sta spinlock)
  */
 struct sta_ampdu_mlme {
+        struct mutex mtx;
         /* rx */
-        bool tid_active_rx[STA_TID_NUM];
         struct tid_ampdu_rx *tid_rx[STA_TID_NUM];
+        unsigned long tid_rx_timer_expired[BITS_TO_LONGS(STA_TID_NUM)];
         /* tx */
-        u8 tid_state_tx[STA_TID_NUM];
+        struct work_struct work;
         struct tid_ampdu_tx *tid_tx[STA_TID_NUM];
         u8 addba_req_num[STA_TID_NUM];
         u8 dialog_token_allocator;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 680bcb7093db..698d4718b1a4 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1092,6 +1092,59 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
         return true;
 }
 
+static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
+                                  struct sk_buff *skb,
+                                  struct ieee80211_tx_info *info,
+                                  struct tid_ampdu_tx *tid_tx,
+                                  int tid)
+{
+        bool queued = false;
+
+        if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
+                info->flags |= IEEE80211_TX_CTL_AMPDU;
+        } else if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {
+                /*
+                 * nothing -- this aggregation session is being started
+                 * but that might still fail with the driver
+                 */
+        } else {
+                spin_lock(&tx->sta->lock);
+                /*
+                 * Need to re-check now, because we may get here
+                 *
+                 *  1) in the window during which the setup is actually
+                 *     already done, but not marked yet because not all
+                 *     packets are spliced over to the driver pending
+                 *     queue yet -- if this happened we acquire the lock
+                 *     either before or after the splice happens, but
+                 *     need to recheck which of these cases happened.
+                 *
+                 *  2) during session teardown, if the OPERATIONAL bit
+                 *     was cleared due to the teardown but the pointer
+                 *     hasn't been assigned NULL yet (or we loaded it
+                 *     before it was assigned) -- in this case it may
+                 *     now be NULL which means we should just let the
+                 *     packet pass through because splicing the frames
+                 *     back is already done.
+                 */
+                tid_tx = tx->sta->ampdu_mlme.tid_tx[tid];
+
+                if (!tid_tx) {
+                        /* do nothing, let packet pass through */
+                } else if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
+                        info->flags |= IEEE80211_TX_CTL_AMPDU;
+                } else {
+                        queued = true;
+                        info->control.vif = &tx->sdata->vif;
+                        info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
+                        __skb_queue_tail(&tid_tx->pending, skb);
+                }
+                spin_unlock(&tx->sta->lock);
+        }
+
+        return queued;
+}
+
 /*
  * initialises @tx
  */
@@ -1104,8 +1157,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_hdr *hdr;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         int hdrlen, tid;
-        u8 *qc, *state;
-        bool queued = false;
+        u8 *qc;
 
         memset(tx, 0, sizeof(*tx));
         tx->skb = skb;
@@ -1157,35 +1209,16 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
                 qc = ieee80211_get_qos_ctl(hdr);
                 tid = *qc & IEEE80211_QOS_CTL_TID_MASK;
 
-                spin_lock(&tx->sta->lock);
-                /*
-                 * XXX: This spinlock could be fairly expensive, but see the
-                 *      comment in agg-tx.c:ieee80211_agg_tx_operational().
-                 *      One way to solve this would be to do something RCU-like
-                 *      for managing the tid_tx struct and using atomic bitops
-                 *      for the actual state -- by introducing an actual
-                 *      'operational' bit that would be possible. It would
-                 *      require changing ieee80211_agg_tx_operational() to
-                 *      set that bit, and changing the way tid_tx is managed
-                 *      everywhere, including races between that bit and
-                 *      tid_tx going away (tid_tx being added can be easily
-                 *      committed to memory before the 'operational' bit).
-                 */
-                tid_tx = tx->sta->ampdu_mlme.tid_tx[tid];
-                state = &tx->sta->ampdu_mlme.tid_state_tx[tid];
-                if (*state == HT_AGG_STATE_OPERATIONAL) {
-                        info->flags |= IEEE80211_TX_CTL_AMPDU;
-                } else if (*state != HT_AGG_STATE_IDLE) {
-                        /* in progress */
-                        queued = true;
-                        info->control.vif = &sdata->vif;
-                        info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
-                        __skb_queue_tail(&tid_tx->pending, skb);
-                }
-                spin_unlock(&tx->sta->lock);
+                tid_tx = rcu_dereference(tx->sta->ampdu_mlme.tid_tx[tid]);
+                if (tid_tx) {
+                        bool queued;
 
-                if (unlikely(queued))
-                        return TX_QUEUED;
+                        queued = ieee80211_tx_prep_agg(tx, skb, info,
+                                                       tid_tx, tid);
+
+                        if (unlikely(queued))
+                                return TX_QUEUED;
+                }
         }
 
         if (is_multicast_ether_addr(hdr->addr1)) {
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 5b79d552780a..a54cf146ed50 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1138,18 +1138,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         }
         mutex_unlock(&local->sta_mtx);
 
-        /* Clear Suspend state so that ADDBA requests can be processed */
-
-        rcu_read_lock();
-
-        if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
-                list_for_each_entry_rcu(sta, &local->sta_list, list) {
-                        clear_sta_flags(sta, WLAN_STA_BLOCK_BA);
-                }
-        }
-
-        rcu_read_unlock();
-
         /* setup RTS threshold */
         drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
 
@@ -1202,13 +1190,26 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 }
         }
 
-        rcu_read_lock();
+        /*
+         * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
+         * sessions can be established after a resume.
+         *
+         * Also tear down aggregation sessions since reconfiguring
+         * them in a hardware restart scenario is not easily done
+         * right now, and the hardware will have lost information
+         * about the sessions, but we and the AP still think they
+         * are active. This is really a workaround though.
+         */
         if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
-                list_for_each_entry_rcu(sta, &local->sta_list, list) {
+                mutex_lock(&local->sta_mtx);
+
+                list_for_each_entry(sta, &local->sta_list, list) {
                         ieee80211_sta_tear_down_BA_sessions(sta);
+                        clear_sta_flags(sta, WLAN_STA_BLOCK_BA);
                 }
+
+                mutex_unlock(&local->sta_mtx);
         }
-        rcu_read_unlock();
 
         /* add back keys */
         list_for_each_entry(sdata, &local->interfaces, list)
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index 4157717ed786..c22a71c5cb45 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -715,7 +715,7 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
         struct ieee80211_rx_status *rx_status;
         struct ieee80211_mgmt *mgmt;
         struct ieee80211_work *wk;
-        enum work_action rma;
+        enum work_action rma = WORK_ACT_NONE;
         u16 fc;
 
         rx_status = (struct ieee80211_rx_status *) skb->cb;
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 0adbcc941ac9..a14e67707476 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -436,6 +436,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
         struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
         u8 pn[CCMP_PN_LEN];
         int data_len;
+        int queue;
 
         hdrlen = ieee80211_hdrlen(hdr->frame_control);
 
@@ -453,7 +454,10 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
 
         ccmp_hdr2pn(pn, skb->data + hdrlen);
 
-        if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) {
+        queue = ieee80211_is_mgmt(hdr->frame_control) ?
+                NUM_RX_DATA_QUEUES : rx->queue;
+
+        if (memcmp(pn, key->u.ccmp.rx_pn[queue], CCMP_PN_LEN) <= 0) {
                 key->u.ccmp.replays++;
                 return RX_DROP_UNUSABLE;
         }
@@ -470,7 +474,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
                         return RX_DROP_UNUSABLE;
         }
 
-        memcpy(key->u.ccmp.rx_pn[rx->queue], pn, CCMP_PN_LEN);
+        memcpy(key->u.ccmp.rx_pn[queue], pn, CCMP_PN_LEN);
 
         /* Remove CCMP header and MIC */
         skb_trim(skb, skb->len - CCMP_MIC_LEN);
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index f69ae19f497f..9f95354f859f 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -846,8 +846,9 @@ int cfg80211_mlme_action(struct cfg80211_registered_device *rdev,
                 if (!wdev->current_bss ||
                     memcmp(wdev->current_bss->pub.bssid, mgmt->bssid,
                            ETH_ALEN) != 0 ||
-                    memcmp(wdev->current_bss->pub.bssid, mgmt->da,
-                           ETH_ALEN) != 0)
+                    (wdev->iftype == NL80211_IFTYPE_STATION &&
+                     memcmp(wdev->current_bss->pub.bssid, mgmt->da,
+                            ETH_ALEN) != 0))
                         return -ENOTCONN;
         }
 
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3a7b8a2f2d5a..6b41d15c4a05 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3955,6 +3955,55 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
                 }
         }
 
+        if (info->attrs[NL80211_ATTR_BSS_BASIC_RATES]) {
+                u8 *rates =
+                        nla_data(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
+                int n_rates =
+                        nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
+                struct ieee80211_supported_band *sband =
+                        wiphy->bands[ibss.channel->band];
+                int i, j;
+
+                if (n_rates == 0) {
+                        err = -EINVAL;
+                        goto out;
+                }
+
+                for (i = 0; i < n_rates; i++) {
+                        int rate = (rates[i] & 0x7f) * 5;
+                        bool found = false;
+
+                        for (j = 0; j < sband->n_bitrates; j++) {
+                                if (sband->bitrates[j].bitrate == rate) {
+                                        found = true;
+                                        ibss.basic_rates |= BIT(j);
+                                        break;
+                                }
+                        }
+                        if (!found) {
+                                err = -EINVAL;
+                                goto out;
+                        }
+                }
+        } else {
+                /*
+                * If no rates were explicitly configured,
+                * use the mandatory rate set for 11b or
+                * 11a for maximum compatibility.
+                */
+                struct ieee80211_supported_band *sband =
+                        wiphy->bands[ibss.channel->band];
+                int j;
+                u32 flag = ibss.channel->band == IEEE80211_BAND_5GHZ ?
+                        IEEE80211_RATE_MANDATORY_A :
+                        IEEE80211_RATE_MANDATORY_B;
+
+                for (j = 0; j < sband->n_bitrates; j++) {
+                        if (sband->bitrates[j].flags & flag)
+                                ibss.basic_rates |= BIT(j);
+                }
+        }
+
         err = cfg80211_join_ibss(rdev, dev, &ibss, connkeys);
 
 out:
@@ -4653,7 +4702,8 @@ static int nl80211_register_action(struct sk_buff *skb, struct genl_info *info)
         if (err)
                 goto unlock_rtnl;
 
-        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION &&
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
@@ -4703,7 +4753,8 @@ static int nl80211_action(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {
+        if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION &&
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC) {
                 err = -EOPNOTSUPP;
                 goto out;
         }