mac80211: fix compile errors because of duplicate atomic64 implementations (#9690)

[openwrt.git] / package / mac80211 / patches / 300-pending_work.patch

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index f06e9df..7e3160a 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,619 +1,1118 @@
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -1456,7 +1456,8 @@ static void reg_process_hint(struct regu
-        * We only time out user hints, given that they should be the only
-        * source of bogus requests.
-        */
--      if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
-+      if (r != -EALREADY &&
-+          reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
-               schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
- }
+--- a/net/mac80211/agg-rx.c
++++ b/net/mac80211/agg-rx.c
+@@ -176,6 +176,8 @@ static void ieee80211_send_addba_resp(st
+               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+               memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
++      else if (sdata->vif.type == NL80211_IFTYPE_WDS)
++              memcpy(mgmt->bssid, da, ETH_ALEN);

  
  

---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -18,13 +18,13 @@
- #include "hw-ops.h"
- #include "ar9003_phy.h"
- 
--#define MPASS 3
- #define MAX_MEASUREMENT       8
--#define MAX_DIFFERENCE        10
-+#define MAX_MAG_DELTA 11
-+#define MAX_PHS_DELTA 10
- 
- struct coeff {
--      int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MPASS];
--      int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MPASS];
-+      int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
-+      int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
-       int iqc_coeff[2];
- };
+       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                         IEEE80211_STYPE_ACTION);
+@@ -262,7 +264,11 @@ void ieee80211_process_addba_request(str
+                               "%pM on tid %u\n",
+                               mgmt->sa, tid);
+ #endif /* CONFIG_MAC80211_HT_DEBUG */
+-              goto end;
++
++              /* delete existing Rx BA session on the same tid */
++              ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
++                                              WLAN_STATUS_UNSPECIFIED_QOS,
++                                              false);
+       }

  
  

-@@ -608,36 +608,48 @@ static bool ar9003_hw_calc_iq_corr(struc
-       return true;
- }
+       /* prepare A-MPDU MLME for Rx aggregation */
+--- a/net/mac80211/agg-tx.c
++++ b/net/mac80211/agg-tx.c
+@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
+       memcpy(mgmt->da, da, ETH_ALEN);
+       memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
+       if (sdata->vif.type == NL80211_IFTYPE_AP ||
+-          sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
++          sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
++          sdata->vif.type == NL80211_IFTYPE_WDS)
+               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+               memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
+        */
+       if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+           sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+-          sdata->vif.type != NL80211_IFTYPE_AP)
++          sdata->vif.type != NL80211_IFTYPE_AP &&
++          sdata->vif.type != NL80211_IFTYPE_WDS)
+               return -EINVAL;

  
  

--static bool ar9003_hw_compute_closest_pass_and_avg(int *mp_coeff, int *mp_avg)
-+static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
-+                                   int max_delta)
+       if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
+--- a/net/mac80211/debugfs_sta.c
++++ b/net/mac80211/debugfs_sta.c
+@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
+       char buf[100];
+       struct sta_info *sta = file->private_data;
+       u32 staflags = get_sta_flags(sta);
+-      int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
++      int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
+               staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
+               staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
+               staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
+@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
+               staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
+               staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
+               staflags & WLAN_STA_WME ? "WME\n" : "",
+-              staflags & WLAN_STA_WDS ? "WDS\n" : "",
+               staflags & WLAN_STA_MFP ? "MFP\n" : "");
+       return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_

  {
  {

--      int diff[MPASS];
+       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_local *local = sdata->local;
+-      struct sta_info *sta;
+       u32 changed = 0;
+       int res;
+       u32 hw_reconf_flags = 0;
+@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+ 
+       set_bit(SDATA_STATE_RUNNING, &sdata->state);
+ 
+-      if (sdata->vif.type == NL80211_IFTYPE_WDS) {
+-              /* Create STA entry for the WDS peer */
+-              sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
+-                                   GFP_KERNEL);
+-              if (!sta) {
+-                      res = -ENOMEM;
+-                      goto err_del_interface;
+-              }

 -
 -

--      diff[0] = abs(mp_coeff[0] - mp_coeff[1]);
--      diff[1] = abs(mp_coeff[1] - mp_coeff[2]);
--      diff[2] = abs(mp_coeff[2] - mp_coeff[0]);
+-              /* no locking required since STA is not live yet */
+-              sta->flags |= WLAN_STA_AUTHORIZED;

 -
 -

--      if (diff[0] > MAX_DIFFERENCE &&
--          diff[1] > MAX_DIFFERENCE &&
--          diff[2] > MAX_DIFFERENCE)
--              return false;
+-              res = sta_info_insert(sta);
+-              if (res) {
+-                      /* STA has been freed */
+-                      goto err_del_interface;
+-              }

 -
 -

--      if (diff[0] <= diff[1] && diff[0] <= diff[2])
--              *mp_avg = (mp_coeff[0] + mp_coeff[1]) / 2;
--      else if (diff[1] <= diff[2])
--              *mp_avg = (mp_coeff[1] + mp_coeff[2]) / 2;
--      else
--              *mp_avg = (mp_coeff[2] + mp_coeff[0]) / 2;
-+      int mp_max = -64, max_idx = 0;
-+      int mp_min = 63, min_idx = 0;
-+      int mp_avg = 0, i, outlier_idx = 0;
+-              rate_control_rate_init(sta);
+-      }
+-
+       /*
+        * set_multicast_list will be invoked by the networking core
+        * which will check whether any increments here were done in
+@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
+       netif_tx_start_all_queues(dev);
+ 
+       return 0;
+- err_del_interface:
+-      drv_remove_interface(local, &sdata->vif);

 +
 +

-+      /* find min/max mismatch across all calibrated gains */
-+      for (i = 0; i < nmeasurement; i++) {
-+              mp_avg += mp_coeff[i];
-+              if (mp_coeff[i] > mp_max) {
-+                      mp_max = mp_coeff[i];
-+                      max_idx = i;
-+              } else if (mp_coeff[i] < mp_min) {
-+                      mp_min = mp_coeff[i];
-+                      min_idx = i;
-+              }
-+      }
+  err_stop:
+       if (!local->open_count)
+               drv_stop(local);
+@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+       dev->destructor = free_netdev;
+ }

  
  

--      return true;
-+      /* find average (exclude max abs value) */
-+      for (i = 0; i < nmeasurement; i++) {
-+              if ((abs(mp_coeff[i]) < abs(mp_max)) ||
-+                  (abs(mp_coeff[i]) < abs(mp_min)))
-+                      mp_avg += mp_coeff[i];
++static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
++                                       struct sk_buff *skb)
++{
++      struct ieee80211_local *local = sdata->local;
++      struct ieee80211_rx_status *rx_status;
++      struct ieee802_11_elems elems;
++      struct ieee80211_mgmt *mgmt;
++      struct sta_info *sta;
++      size_t baselen;
++      u32 rates = 0;
++      u16 stype;
++      bool new = false;
++      enum ieee80211_band band = local->hw.conf.channel->band;
++      struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
++
++      rx_status = IEEE80211_SKB_RXCB(skb);
++      mgmt = (struct ieee80211_mgmt *) skb->data;
++      stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
++
++      if (stype != IEEE80211_STYPE_BEACON)
++              return;
++
++      baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
++      if (baselen > skb->len)
++              return;
++
++      ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
++                             skb->len - baselen, &elems);
++
++      rates = ieee80211_sta_get_rates(local, &elems, band);
++
++      rcu_read_lock();
++
++      sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
++
++      if (!sta) {
++              rcu_read_unlock();
++              sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
++                                   GFP_KERNEL);
++              if (!sta)
++                      return;
++
++              new = true;

 +      }
 +      }

-+      mp_avg /= (nmeasurement - 1);

 +
 +

-+      /* detect outlier */
-+      if (abs(mp_max - mp_min) > max_delta) {
-+              if (abs(mp_max - mp_avg) > abs(mp_min - mp_avg))
-+                      outlier_idx = max_idx;
-+              else
-+                      outlier_idx = min_idx;
++      sta->last_rx = jiffies;
++      sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
++
++      if (elems.ht_cap_elem)
++              ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++                              elems.ht_cap_elem, &sta->sta.ht_cap);
++
++      if (elems.wmm_param)
++              set_sta_flags(sta, WLAN_STA_WME);
++
++      if (new) {
++              sta->flags = WLAN_STA_AUTHORIZED;
++              rate_control_rate_init(sta);
++              sta_info_insert_rcu(sta);

 +      }
 +      }

-+      mp_coeff[outlier_idx] = mp_avg;
- }
- 
- static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
-                                                u8 num_chains,
-                                                struct coeff *coeff)
++
++      rcu_read_unlock();
++}
++
+ static void ieee80211_iface_work(struct work_struct *work)

  {
  {

--      struct ath_common *common = ath9k_hw_common(ah);
-       int i, im, nmeasurement;
--      int magnitude, phase;
-       u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
- 
-       memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));
-@@ -657,37 +669,28 @@ static void ar9003_hw_tx_iqcal_load_avg_
- 
-       /* Load the average of 2 passes */
-       for (i = 0; i < num_chains; i++) {
--              if (AR_SREV_9485(ah))
--                      nmeasurement = REG_READ_FIELD(ah,
--                                      AR_PHY_TX_IQCAL_STATUS_B0_9485,
--                                      AR_PHY_CALIBRATED_GAINS_0);
--              else
--                      nmeasurement = REG_READ_FIELD(ah,
--                                      AR_PHY_TX_IQCAL_STATUS_B0,
--                                      AR_PHY_CALIBRATED_GAINS_0);
-+              nmeasurement = REG_READ_FIELD(ah,
-+                              AR_PHY_TX_IQCAL_STATUS_B0,
-+                              AR_PHY_CALIBRATED_GAINS_0);
- 
-               if (nmeasurement > MAX_MEASUREMENT)
-                       nmeasurement = MAX_MEASUREMENT;
- 
--              for (im = 0; im < nmeasurement; im++) {
--                      /*
--                       * Determine which 2 passes are closest and compute avg
--                       * magnitude
--                       */
--                      if (!ar9003_hw_compute_closest_pass_and_avg(coeff->mag_coeff[i][im],
--                                                                  &magnitude))
--                              goto disable_txiqcal;
-+              /* detect outlier only if nmeasurement > 1 */
-+              if (nmeasurement > 1) {
-+                      /* Detect magnitude outlier */
-+                      ar9003_hw_detect_outlier(coeff->mag_coeff[i],
-+                                      nmeasurement, MAX_MAG_DELTA);
+       struct ieee80211_sub_if_data *sdata =
+@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct 
+                               break;
+                       ieee80211_mesh_rx_queued_mgmt(sdata, skb);
+                       break;
++              case NL80211_IFTYPE_WDS:
++                      ieee80211_wds_rx_queued_mgmt(sdata, skb);
++                      break;
+               default:
+                       WARN(1, "frame for unexpected interface type");
+                       break;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2137,7 +2137,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+                */
+               if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+                   sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+-                  sdata->vif.type != NL80211_IFTYPE_AP)
++                  sdata->vif.type != NL80211_IFTYPE_AP &&
++                  sdata->vif.type != NL80211_IFTYPE_WDS)
+                       break;
+ 
+               /* verify action_code is present */
+@@ -2335,13 +2336,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+ 
+       if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+           sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+-          sdata->vif.type != NL80211_IFTYPE_STATION)
++          sdata->vif.type != NL80211_IFTYPE_STATION &&
++          sdata->vif.type != NL80211_IFTYPE_WDS)
+               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 */
++              /* process for all: mesh, mlme, ibss, wds */
+               break;
+       case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+       case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+@@ -2680,10 +2682,16 @@ static int prepare_for_handlers(struct i
+               }
+               break;
+       case NL80211_IFTYPE_WDS:
+-              if (bssid || !ieee80211_is_data(hdr->frame_control))
+-                      return 0;
+               if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
+                       return 0;
++
++              if (ieee80211_is_data(hdr->frame_control) ||
++                  ieee80211_is_action(hdr->frame_control)) {
++                      if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
++                              return 0;
++              } else if (!ieee80211_is_beacon(hdr->frame_control))
++                      return 0;

 +
 +

-+                      /* Detect phase outlier */
-+                      ar9003_hw_detect_outlier(coeff->phs_coeff[i],
-+                                      nmeasurement, MAX_PHS_DELTA);
+               break;
+       default:
+               /* should never get here */
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -31,7 +31,6 @@
+  *    frames.
+  * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
+  * @WLAN_STA_WME: Station is a QoS-STA.
+- * @WLAN_STA_WDS: Station is one of our WDS peers.
+  * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
+  *    IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
+  *    frame to this station is transmitted.
+@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
+       WLAN_STA_SHORT_PREAMBLE = 1<<4,
+       WLAN_STA_ASSOC_AP       = 1<<5,
+       WLAN_STA_WME            = 1<<6,
+-      WLAN_STA_WDS            = 1<<7,
+       WLAN_STA_CLEAR_PS_FILT  = 1<<9,
+       WLAN_STA_MFP            = 1<<10,
+       WLAN_STA_BLOCK_BA       = 1<<11,
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -360,6 +360,7 @@ void ath_beacon_tasklet(unsigned long da
+       struct ath_common *common = ath9k_hw_common(ah);
+       struct ath_buf *bf = NULL;
+       struct ieee80211_vif *vif;
++      struct ath_tx_status ts;
+       int slot;
+       u32 bfaddr, bc = 0;
+ 
+@@ -384,7 +385,9 @@ void ath_beacon_tasklet(unsigned long da
+                       ath_dbg(common, ATH_DBG_BSTUCK,
+                               "beacon is officially stuck\n");
+                       sc->sc_flags |= SC_OP_TSF_RESET;
++                      spin_lock(&sc->sc_pcu_lock);
+                       ath_reset(sc, true);
++                      spin_unlock(&sc->sc_pcu_lock);
+               }
+ 
+               return;
+@@ -464,6 +467,11 @@ void ath_beacon_tasklet(unsigned long da
+               ath9k_hw_txstart(ah, sc->beacon.beaconq);
+ 
+               sc->beacon.ast_be_xmit += bc;     /* XXX per-vif? */
++              if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
++                      spin_lock_bh(&sc->sc_pcu_lock);
++                      ath9k_hw_txprocdesc(ah, bf->bf_desc, (void *)&ts);
++                      spin_unlock_bh(&sc->sc_pcu_lock);

 +              }
 +              }

+       }
+ }

  
  

--                      /*
--                       * Determine which 2 passes are closest and compute avg
--                       * phase
--                       */
--                      if (!ar9003_hw_compute_closest_pass_and_avg(coeff->phs_coeff[i][im],
--                                                                  &phase))
--                              goto disable_txiqcal;
-+              for (im = 0; im < nmeasurement; im++) {
- 
--                      coeff->iqc_coeff[0] = (magnitude & 0x7f) |
--                                            ((phase & 0x7f) << 7);
-+                      coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
-+                              ((coeff->phs_coeff[i][im] & 0x7f) << 7);
- 
-                       if ((im % 2) == 0)
-                               REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
-@@ -707,141 +710,37 @@ static void ar9003_hw_tx_iqcal_load_avg_
- 
-       return;
- 
--disable_txiqcal:
--      REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_3,
--                    AR_PHY_TX_IQCAL_CONTROL_3_IQCORR_EN, 0x0);
--      REG_RMW_FIELD(ah, AR_PHY_RX_IQCAL_CORR_B0,
--                    AR_PHY_RX_IQCAL_CORR_B0_LOOPBACK_IQCORR_EN, 0x0);
--
--      ath_dbg(common, ATH_DBG_CALIBRATE, "TX IQ Cal disabled\n");
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -617,8 +617,11 @@ void ath_hw_check(struct work_struct *wo
+       ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
+               "busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
+       if (busy >= 99) {
+-              if (++sc->hw_busy_count >= 3)
++              if (++sc->hw_busy_count >= 3) {
++                      spin_lock_bh(&sc->sc_pcu_lock);
+                       ath_reset(sc, true);
++                      spin_unlock_bh(&sc->sc_pcu_lock);
++              }
+       } else if (busy >= 0)
+               sc->hw_busy_count = 0;
+ 
+@@ -637,7 +640,9 @@ static void ath_hw_pll_rx_hang_check(str
+                       /* Rx is hung for more than 500ms. Reset it */
+                       ath_dbg(common, ATH_DBG_RESET,
+                               "Possible RX hang, resetting");
++                      spin_lock_bh(&sc->sc_pcu_lock);
+                       ath_reset(sc, true);
++                      spin_unlock_bh(&sc->sc_pcu_lock);
+                       count = 0;
+               }
+       } else
+@@ -674,7 +679,9 @@ void ath9k_tasklet(unsigned long data)
+ 
+       if ((status & ATH9K_INT_FATAL) ||
+           (status & ATH9K_INT_BB_WATCHDOG)) {
++              spin_lock(&sc->sc_pcu_lock);
+               ath_reset(sc, true);
++              spin_unlock(&sc->sc_pcu_lock);
+               return;
+       }
+ 
+@@ -980,7 +987,6 @@ int ath_reset(struct ath_softc *sc, bool
+       del_timer_sync(&common->ani.timer);
+ 
+       ath9k_ps_wakeup(sc);
+-      spin_lock_bh(&sc->sc_pcu_lock);
+ 
+       ieee80211_stop_queues(hw);
+ 
+@@ -1023,7 +1029,6 @@ int ath_reset(struct ath_softc *sc, bool
+       }
+ 
+       ieee80211_wake_queues(hw);
+-      spin_unlock_bh(&sc->sc_pcu_lock);
+ 
+       /* Start ANI */
+       if (!common->disable_ani)
+@@ -2326,9 +2331,9 @@ static void ath9k_flush(struct ieee80211
+       ath9k_ps_wakeup(sc);
+       spin_lock_bh(&sc->sc_pcu_lock);
+       drain_txq = ath_drain_all_txq(sc, false);
+-      spin_unlock_bh(&sc->sc_pcu_lock);
+       if (!drain_txq)
+               ath_reset(sc, false);
++      spin_unlock_bh(&sc->sc_pcu_lock);
+       ath9k_ps_restore(sc);
+       ieee80211_wake_queues(hw);
+ 
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -565,11 +565,8 @@ static void ath_tx_complete_aggr(struct 
+ 
+       rcu_read_unlock();
+ 
+-      if (needreset) {
+-              spin_unlock_bh(&sc->sc_pcu_lock);
++      if (needreset)
+               ath_reset(sc, false);
+-              spin_lock_bh(&sc->sc_pcu_lock);
+-      }

  }
  
  }
  

--static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
-+static bool ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)
+ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
+@@ -664,7 +661,8 @@ static int ath_compute_num_delims(struct
+        * TODO - this could be improved to be dependent on the rate.
+        *      The hardware can keep up at lower rates, but not higher rates
+        */
+-      if (fi->keyix != ATH9K_TXKEYIX_INVALID)
++      if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&
++          !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))
+               ndelim += ATH_AGGR_ENCRYPTDELIM;
+ 
+       /*
+@@ -2169,7 +2167,9 @@ static void ath_tx_complete_poll_work(st
+       if (needreset) {
+               ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
+                       "tx hung, resetting the chip\n");
++              spin_lock_bh(&sc->sc_pcu_lock);
+               ath_reset(sc, true);
++              spin_unlock_bh(&sc->sc_pcu_lock);
+       }
+ 
+       ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -236,7 +236,7 @@ static void ar9003_paprd_get_gain_table(
+       memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
+       memset(index, 0, sizeof(ah->paprd_gain_table_index));
+ 
+-      for (i = 0; i < 32; i++) {
++      for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
+               entry[i] = REG_READ(ah, reg);
+               index[i] = (entry[i] >> 24) & 0xff;
+               reg += 4;
+@@ -246,13 +246,13 @@ static void ar9003_paprd_get_gain_table(
+ static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
+                                           int target_power)

  {
  {

-       struct ath_common *common = ath9k_hw_common(ah);
--      static const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
--              AR_PHY_TX_IQCAL_STATUS_B0,
--              AR_PHY_TX_IQCAL_STATUS_B1,
--              AR_PHY_TX_IQCAL_STATUS_B2,
--      };
--      static const u32 chan_info_tab[] = {
--              AR_PHY_CHAN_INFO_TAB_0,
--              AR_PHY_CHAN_INFO_TAB_1,
--              AR_PHY_CHAN_INFO_TAB_2,
--      };
--      struct coeff coeff;
--      s32 iq_res[6];
--      s32 i, j, ip, im, nmeasurement;
--      u8 nchains = get_streams(common->tx_chainmask);
--
--      for (ip = 0; ip < MPASS; ip++) {
--              REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
--                            AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
--                            DELPT);
--              REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START,
--                            AR_PHY_TX_IQCAL_START_DO_CAL,
--                            AR_PHY_TX_IQCAL_START_DO_CAL);
--
--              if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,
--                                 AR_PHY_TX_IQCAL_START_DO_CAL,
--                                 0, AH_WAIT_TIMEOUT)) {
--                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                              "Tx IQ Cal not complete.\n");
--                      goto TX_IQ_CAL_FAILED;
--              }
--
--              nmeasurement = REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_STATUS_B0,
--                                            AR_PHY_CALIBRATED_GAINS_0);
--                      if (nmeasurement > MAX_MEASUREMENT)
--                              nmeasurement = MAX_MEASUREMENT;
--
--              for (i = 0; i < nchains; i++) {
--                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                              "Doing Tx IQ Cal for chain %d.\n", i);
--                      for (im = 0; im < nmeasurement; im++) {
--                              if (REG_READ(ah, txiqcal_status[i]) &
--                                           AR_PHY_TX_IQCAL_STATUS_FAILED) {
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                                              "Tx IQ Cal failed for chain %d.\n", i);
--                                      goto TX_IQ_CAL_FAILED;
--                              }
--
--                              for (j = 0; j < 3; j++) {
--                                      u8 idx = 2 * j,
--                                         offset = 4 * (3 * im + j);
--
--                                      REG_RMW_FIELD(ah, AR_PHY_CHAN_INFO_MEMORY,
--                                                    AR_PHY_CHAN_INFO_TAB_S2_READ,
--                                                    0);
--
--                                      /* 32 bits */
--                                      iq_res[idx] = REG_READ(ah,
--                                                      chan_info_tab[i] +
--                                                      offset);
--
--                                      REG_RMW_FIELD(ah, AR_PHY_CHAN_INFO_MEMORY,
--                                                    AR_PHY_CHAN_INFO_TAB_S2_READ,
--                                                    1);
--
--                                      /* 16 bits */
--                                      iq_res[idx+1] = 0xffff & REG_READ(ah,
--                                                              chan_info_tab[i] +
--                                                              offset);
--
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                                              "IQ RES[%d]=0x%x IQ_RES[%d]=0x%x\n",
--                                              idx, iq_res[idx], idx+1, iq_res[idx+1]);
--                              }
--
--                              if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
--                                                          coeff.iqc_coeff)) {
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                                              "Failed in calculation of IQ correction.\n");
--                                      goto TX_IQ_CAL_FAILED;
--                              }
--                              coeff.mag_coeff[i][im][ip] =
--                                              coeff.iqc_coeff[0] & 0x7f;
--                              coeff.phs_coeff[i][im][ip] =
--                                              (coeff.iqc_coeff[0] >> 7) & 0x7f;
--
--                              if (coeff.mag_coeff[i][im][ip] > 63)
--                                      coeff.mag_coeff[i][im][ip] -= 128;
--                              if (coeff.phs_coeff[i][im][ip] > 63)
--                                      coeff.phs_coeff[i][im][ip] -= 128;
--
--                      }
--              }
--      }
--
--      ar9003_hw_tx_iqcal_load_avg_2_passes(ah, nchains, &coeff);
--
--      return;
--
--TX_IQ_CAL_FAILED:
--      ath_dbg(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n");
--}
--
--static void ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)
--{
-       u8 tx_gain_forced;
- 
--      REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1_9485,
--                    AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, DELPT);
-       tx_gain_forced = REG_READ_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-                                       AR_PHY_TXGAIN_FORCE);
-       if (tx_gain_forced)
-               REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-                             AR_PHY_TXGAIN_FORCE, 0);
- 
--      REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START_9485,
--                    AR_PHY_TX_IQCAL_START_DO_CAL_9485, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START,
-+                    AR_PHY_TX_IQCAL_START_DO_CAL, 1);
-+
-+      if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,
-+                      AR_PHY_TX_IQCAL_START_DO_CAL, 0,
-+                      AH_WAIT_TIMEOUT)) {
-+              ath_dbg(common, ATH_DBG_CALIBRATE,
-+                      "Tx IQ Cal is not completed.\n");
-+              return false;
+-      int olpc_gain_delta = 0;
++      int olpc_gain_delta = 0, cl_gain_mod;
+       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;
++      u32 reg_olpc  = 0, reg_cl_gain  = 0;
+ 
+       REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                   AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+@@ -271,15 +271,29 @@ static unsigned int ar9003_get_desired_g
+       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;
++      switch (chain) {
++      case 0:
++              reg_olpc = AR_PHY_TPC_11_B0;
++              reg_cl_gain = AR_PHY_CL_TAB_0;
++              break;
++      case 1:
++              reg_olpc = AR_PHY_TPC_11_B1;
++              reg_cl_gain = AR_PHY_CL_TAB_1;
++              break;
++      case 2:
++              reg_olpc = AR_PHY_TPC_11_B2;
++              reg_cl_gain = AR_PHY_CL_TAB_2;
++              break;
++      default:
++              ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
++              "Invalid chainmask: %d\n", chain);
++              break;

 +      }
 +      }

-+      return true;
+ 
+-      olpc_gain_delta = REG_READ_FIELD(ah, reg,
++      olpc_gain_delta = REG_READ_FIELD(ah, reg_olpc,
+                                        AR_PHY_TPC_11_OLPC_GAIN_DELTA);
++      cl_gain_mod = REG_READ_FIELD(ah, reg_cl_gain,
++                                       AR_PHY_CL_TAB_CL_GAIN_MOD);
+ 
+       if (olpc_gain_delta >= 128)
+               olpc_gain_delta = olpc_gain_delta - 256;
+@@ -289,7 +303,7 @@ static unsigned int ar9003_get_desired_g
+       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;
++          voltage_gain_corr + desired_scale + cl_gain_mod;
+ 
+       return desired_gain;

  }
  }

+@@ -727,7 +741,7 @@ int ar9003_paprd_setup_gain_table(struct
+       desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
+ 
+       gain_index = 0;
+-      for (i = 0; i < 32; i++) {
++      for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
+               if (ah->paprd_gain_table_index[i] >= desired_gain)
+                       break;
+               gain_index++;
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+@@ -1121,6 +1121,9 @@
+ #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5    0x3F00
+ #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5_S  8
+ 
++#define AR_PHY_CL_TAB_CL_GAIN_MOD             0x1f
++#define AR_PHY_CL_TAB_CL_GAIN_MOD_S           0
++
+ void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
+ 
+ #endif  /* AR9003_PHY_H */
+--- a/drivers/net/wireless/ath/ath5k/eeprom.c
++++ b/drivers/net/wireless/ath/ath5k/eeprom.c
+@@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k
+               if (!chinfo[pier].pd_curves)
+                       continue;
+ 
+-              for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
++              for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
+                       struct ath5k_pdgain_info *pd =
+                                       &chinfo[pier].pd_curves[pdg];
+ 
+-                      if (pd != NULL) {
+-                              kfree(pd->pd_step);
+-                              kfree(pd->pd_pwr);
+-                      }
++                      kfree(pd->pd_step);
++                      kfree(pd->pd_pwr);
+               }

  
  

- static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah)
+               kfree(chinfo[pier].pd_curves);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+@@ -229,6 +229,7 @@ static void ar9003_hw_fill_txdesc(struct
+ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
+                                struct ath_tx_status *ts)

  {
  {

-       struct ath_common *common = ath9k_hw_common(ah);
-       const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
--              AR_PHY_TX_IQCAL_STATUS_B0_9485,
-+              AR_PHY_TX_IQCAL_STATUS_B0,
-               AR_PHY_TX_IQCAL_STATUS_B1,
-               AR_PHY_TX_IQCAL_STATUS_B2,
-       };
-@@ -853,7 +752,7 @@ static void ar9003_hw_tx_iq_cal_post_pro
-       struct coeff coeff;
-       s32 iq_res[6];
-       u8 num_chains = 0;
--      int i, ip, im, j;
-+      int i, im, j;
-       int nmeasurement;
- 
-       for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-@@ -861,71 +760,69 @@ static void ar9003_hw_tx_iq_cal_post_pro
-                       num_chains++;
-       }
++      struct ar9003_txc *txc = (struct ar9003_txc *) ds;
+       struct ar9003_txs *ads;
+       u32 status;
+ 
+@@ -238,7 +239,11 @@ static int ar9003_hw_proc_txdesc(struct 
+       if ((status & AR_TxDone) == 0)
+               return -EINPROGRESS;
+ 
+-      ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
++      ts->qid = MS(ads->ds_info, AR_TxQcuNum);
++      if (!txc || (MS(txc->info, AR_TxQcuNum) == ts->qid))
++              ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
++      else
++              return -ENOENT;
+ 
+       if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
+           (MS(ads->ds_info, AR_TxRxDesc) != 1)) {
+@@ -254,7 +259,6 @@ static int ar9003_hw_proc_txdesc(struct 
+       ts->ts_seqnum = MS(status, AR_SeqNum);
+       ts->tid = MS(status, AR_TxTid);

  
  

--      for (ip = 0; ip < MPASS; ip++) {
--              for (i = 0; i < num_chains; i++) {
--                      nmeasurement = REG_READ_FIELD(ah,
--                                      AR_PHY_TX_IQCAL_STATUS_B0_9485,
--                                      AR_PHY_CALIBRATED_GAINS_0);
--                      if (nmeasurement > MAX_MEASUREMENT)
--                              nmeasurement = MAX_MEASUREMENT;
-+      for (i = 0; i < num_chains; i++) {
-+              nmeasurement = REG_READ_FIELD(ah,
-+                              AR_PHY_TX_IQCAL_STATUS_B0,
-+                              AR_PHY_CALIBRATED_GAINS_0);
-+              if (nmeasurement > MAX_MEASUREMENT)
-+                      nmeasurement = MAX_MEASUREMENT;
+-      ts->qid = MS(ads->ds_info, AR_TxQcuNum);
+       ts->desc_id = MS(ads->status1, AR_TxDescId);
+       ts->ts_tstamp = ads->status4;
+       ts->ts_status = 0;
+--- a/net/mac80211/wpa.c
++++ b/net/mac80211/wpa.c
+@@ -15,6 +15,7 @@
+ #include <linux/gfp.h>
+ #include <asm/unaligned.h>
+ #include <net/mac80211.h>
++#include <crypto/aes.h>
+ 
+ #include "ieee80211_i.h"
+ #include "michael.h"
+@@ -86,6 +87,11 @@ ieee80211_rx_h_michael_mic_verify(struct
+       struct sk_buff *skb = rx->skb;
+       struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
++      int queue = rx->queue;

 +
 +

-+              for (im = 0; im < nmeasurement; im++) {
-+                      ath_dbg(common, ATH_DBG_CALIBRATE,
-+                              "Doing Tx IQ Cal for chain %d.\n", i);
- 
--                      for (im = 0; im < nmeasurement; im++) {
-+                      if (REG_READ(ah, txiqcal_status[i]) &
-+                                      AR_PHY_TX_IQCAL_STATUS_FAILED) {
-                               ath_dbg(common, ATH_DBG_CALIBRATE,
--                                      "Doing Tx IQ Cal for chain %d.\n", i);
--
--                              if (REG_READ(ah, txiqcal_status[i]) &
--                                  AR_PHY_TX_IQCAL_STATUS_FAILED) {
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
-                                       "Tx IQ Cal failed for chain %d.\n", i);
--                                      goto tx_iqcal_fail;
--                              }
-+                              goto tx_iqcal_fail;
-+                      }
- 
--                              for (j = 0; j < 3; j++) {
--                                      u32 idx = 2 * j, offset = 4 * (3 * im + j);
-+                      for (j = 0; j < 3; j++) {
-+                              u32 idx = 2 * j, offset = 4 * (3 * im + j);
- 
--                                      REG_RMW_FIELD(ah,
-+                              REG_RMW_FIELD(ah,
-                                               AR_PHY_CHAN_INFO_MEMORY,
-                                               AR_PHY_CHAN_INFO_TAB_S2_READ,
-                                               0);
- 
--                                      /* 32 bits */
--                                      iq_res[idx] = REG_READ(ah,
--                                                      chan_info_tab[i] +
--                                                      offset);
-+                              /* 32 bits */
-+                              iq_res[idx] = REG_READ(ah,
-+                                              chan_info_tab[i] +
-+                                              offset);
- 
--                                      REG_RMW_FIELD(ah,
-+                              REG_RMW_FIELD(ah,
-                                               AR_PHY_CHAN_INFO_MEMORY,
-                                               AR_PHY_CHAN_INFO_TAB_S2_READ,
-                                               1);
- 
--                                      /* 16 bits */
--                                      iq_res[idx + 1] = 0xffff & REG_READ(ah,
--                                                        chan_info_tab[i] + offset);
--
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                                              "IQ RES[%d]=0x%x"
--                                              "IQ_RES[%d]=0x%x\n",
--                                              idx, iq_res[idx], idx + 1,
--                                              iq_res[idx + 1]);
--                              }
-+                              /* 16 bits */
-+                              iq_res[idx + 1] = 0xffff & REG_READ(ah,
-+                                              chan_info_tab[i] + offset);
- 
--                              if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
--                                                          coeff.iqc_coeff)) {
--                                      ath_dbg(common, ATH_DBG_CALIBRATE,
--                                       "Failed in calculation of IQ correction.\n");
--                                      goto tx_iqcal_fail;
--                              }
-+                              ath_dbg(common, ATH_DBG_CALIBRATE,
-+                                      "IQ RES[%d]=0x%x"
-+                                      "IQ_RES[%d]=0x%x\n",
-+                                      idx, iq_res[idx], idx + 1,
-+                                      iq_res[idx + 1]);
-+                      }
- 
--                              coeff.mag_coeff[i][im][ip] =
--                                              coeff.iqc_coeff[0] & 0x7f;
--                              coeff.phs_coeff[i][im][ip] =
--                                              (coeff.iqc_coeff[0] >> 7) & 0x7f;
++      /* otherwise, TKIP is vulnerable to TID 0 vs. non-QoS replays */
++      if (rx->queue == NUM_RX_DATA_QUEUES - 1)
++              queue = 0;
+ 
+       /*
+        * it makes no sense to check for MIC errors on anything other
+@@ -148,8 +154,8 @@ ieee80211_rx_h_michael_mic_verify(struct
+ 
+ update_iv:
+       /* update IV in key information to be able to detect replays */
+-      rx->key->u.tkip.rx[rx->queue].iv32 = rx->tkip_iv32;
+-      rx->key->u.tkip.rx[rx->queue].iv16 = rx->tkip_iv16;
++      rx->key->u.tkip.rx[queue].iv32 = rx->tkip_iv32;
++      rx->key->u.tkip.rx[queue].iv16 = rx->tkip_iv16;
+ 
+       return RX_CONTINUE;
+ 
+@@ -165,6 +171,7 @@ static int tkip_encrypt_skb(struct ieee8
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+       struct ieee80211_key *key = tx->key;
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
++      unsigned long flags;
+       unsigned int hdrlen;
+       int len, tail;
+       u8 *pos;
+@@ -192,11 +199,12 @@ static int tkip_encrypt_skb(struct ieee8
+       pos += hdrlen;
+ 
+       /* Increase IV for the frame */
++      spin_lock_irqsave(&key->u.tkip.txlock, flags);
+       key->u.tkip.tx.iv16++;
+       if (key->u.tkip.tx.iv16 == 0)
+               key->u.tkip.tx.iv32++;

 -
 -

--                              if (coeff.mag_coeff[i][im][ip] > 63)
--                                      coeff.mag_coeff[i][im][ip] -= 128;
--                              if (coeff.phs_coeff[i][im][ip] > 63)
--                                      coeff.phs_coeff[i][im][ip] -= 128;
-+                      if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
-+                                              coeff.iqc_coeff)) {
-+                              ath_dbg(common, ATH_DBG_CALIBRATE,
-+                                      "Failed in calculation of \
-+                                      IQ correction.\n");
-+                              goto tx_iqcal_fail;
-                       }
+-      pos = ieee80211_tkip_add_iv(pos, key, key->u.tkip.tx.iv16);
++      pos = ieee80211_tkip_add_iv(pos, key);
++      spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
+ 
+       /* hwaccel - with software IV */
+       if (info->control.hw_key)
+@@ -205,9 +213,8 @@ static int tkip_encrypt_skb(struct ieee8
+       /* Add room for ICV */
+       skb_put(skb, TKIP_ICV_LEN);
+ 
+-      hdr = (struct ieee80211_hdr *) skb->data;
+       return ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm,
+-                                         key, pos, len, hdr->addr2);
++                                         key, skb, pos, len);
+ }
+ 
+ 
+@@ -235,6 +242,11 @@ ieee80211_crypto_tkip_decrypt(struct iee
+       struct ieee80211_key *key = rx->key;
+       struct sk_buff *skb = rx->skb;
+       struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
++      int queue = rx->queue;

 +
 +

-+                      coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
-+                      coeff.phs_coeff[i][im] =
-+                              (coeff.iqc_coeff[0] >> 7) & 0x7f;
++      /* otherwise, TKIP is vulnerable to TID 0 vs. non-QoS replays */
++      if (rx->queue == NUM_RX_DATA_QUEUES - 1)
++              queue = 0;
+ 
+       hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ 
+@@ -255,7 +267,7 @@ ieee80211_crypto_tkip_decrypt(struct iee
+       res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm,
+                                         key, skb->data + hdrlen,
+                                         skb->len - hdrlen, rx->sta->sta.addr,
+-                                        hdr->addr1, hwaccel, rx->queue,
++                                        hdr->addr1, hwaccel, queue,
+                                         &rx->tkip_iv32,
+                                         &rx->tkip_iv16);
+       if (res != TKIP_DECRYPT_OK)
+@@ -283,6 +295,8 @@ static void ccmp_special_blocks(struct s
+       unsigned int hdrlen;
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ 
++      memset(scratch, 0, 6 * AES_BLOCK_LEN);

 +
 +

-+                      if (coeff.mag_coeff[i][im] > 63)
-+                              coeff.mag_coeff[i][im] -= 128;
-+                      if (coeff.phs_coeff[i][im] > 63)
-+                              coeff.phs_coeff[i][im] -= 128;
-               }
-       }
-       ar9003_hw_tx_iqcal_load_avg_2_passes(ah, num_chains, &coeff);
-@@ -941,6 +838,7 @@ static bool ar9003_hw_init_cal(struct at
- {
-       struct ath_common *common = ath9k_hw_common(ah);
-       int val;
-+      bool txiqcal_done = false;
+       b_0 = scratch + 3 * AES_BLOCK_LEN;
+       aad = scratch + 4 * AES_BLOCK_LEN;

  
  

-       val = REG_READ(ah, AR_ENT_OTP);
-       ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
-@@ -957,14 +855,22 @@ static bool ar9003_hw_init_cal(struct at
-               ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
+@@ -373,8 +387,10 @@ static int ccmp_encrypt_skb(struct ieee8
+       struct ieee80211_key *key = tx->key;
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       int hdrlen, len, tail;
+-      u8 *pos, *pn;
+-      int i;
++      u8 *pos;
++      u8 pn[6];
++      u64 pn64;
++      u8 scratch[6 * AES_BLOCK_LEN];

  
  

-       /* Do Tx IQ Calibration */
--      if (AR_SREV_9485(ah))
--              ar9003_hw_tx_iq_cal_run(ah);
--      else
--              ar9003_hw_tx_iq_cal(ah);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
-+                    AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
-+                    DELPT);
- 
--      REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
--      udelay(5);
--      REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-+      /*
-+       * For AR9485 or later chips, TxIQ cal runs as part of
-+       * AGC calibration
-+       */
-+      if (AR_SREV_9485_OR_LATER(ah))
-+              txiqcal_done = true;
-+      else {
-+              txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
-+              REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
-+              udelay(5);
-+              REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-+      }
+       if (info->control.hw_key &&
+           !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV)) {
+@@ -402,14 +418,14 @@ static int ccmp_encrypt_skb(struct ieee8
+       hdr = (struct ieee80211_hdr *) pos;
+       pos += hdrlen;
+ 
+-      /* PN = PN + 1 */
+-      pn = key->u.ccmp.tx_pn;
++      pn64 = atomic64_inc_return(&key->u.ccmp.tx_pn);
+ 
+-      for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
+-              pn[i]++;
+-              if (pn[i])
+-                      break;
+-      }
++      pn[5] = pn64;
++      pn[4] = pn64 >> 8;
++      pn[3] = pn64 >> 16;
++      pn[2] = pn64 >> 24;
++      pn[1] = pn64 >> 32;
++      pn[0] = pn64 >> 40;
+ 
+       ccmp_pn2hdr(pos, pn, key->conf.keyidx);
+ 
+@@ -418,8 +434,8 @@ static int ccmp_encrypt_skb(struct ieee8
+               return 0;

  
  

-       /* Calibrate the AGC */
-       REG_WRITE(ah, AR_PHY_AGC_CONTROL,
-@@ -979,7 +885,7 @@ static bool ar9003_hw_init_cal(struct at
-               return false;
+       pos += CCMP_HDR_LEN;
+-      ccmp_special_blocks(skb, pn, key->u.ccmp.tx_crypto_buf, 0);
+-      ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, key->u.ccmp.tx_crypto_buf, pos, len,
++      ccmp_special_blocks(skb, pn, scratch, 0);
++      ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, scratch, pos, len,
+                                 pos, skb_put(skb, CCMP_MIC_LEN));
+ 
+       return 0;
+@@ -475,11 +491,12 @@ ieee80211_crypto_ccmp_decrypt(struct iee

        }
  
        }
  

--      if (AR_SREV_9485(ah))
-+      if (txiqcal_done)
-               ar9003_hw_tx_iq_cal_post_proc(ah);
+       if (!(status->flag & RX_FLAG_DECRYPTED)) {
++              u8 scratch[6 * AES_BLOCK_LEN];
+               /* hardware didn't decrypt/verify MIC */
+-              ccmp_special_blocks(skb, pn, key->u.ccmp.rx_crypto_buf, 1);
++              ccmp_special_blocks(skb, pn, scratch, 1);

  
  

-       /* Revert chainmasks to their original values before NF cal */
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -548,15 +548,12 @@
+               if (ieee80211_aes_ccm_decrypt(
+-                          key->u.ccmp.tfm, key->u.ccmp.rx_crypto_buf,
++                          key->u.ccmp.tfm, scratch,
+                           skb->data + hdrlen + CCMP_HDR_LEN, data_len,
+                           skb->data + skb->len - CCMP_MIC_LEN,
+                           skb->data + hdrlen + CCMP_HDR_LEN))
+--- a/drivers/net/wireless/b43/xmit.c
++++ b/drivers/net/wireless/b43/xmit.c
+@@ -323,8 +323,7 @@ int b43_generate_txhdr(struct b43_wldev 
+                       /* we give the phase1key and iv16 here, the key is stored in
+                        * shm. With that the hardware can do phase 2 and encryption.
+                        */
+-                      ieee80211_get_tkip_key(info->control.hw_key, skb_frag,
+-                                      IEEE80211_TKIP_P1_KEY, (u8*)phase1key);
++                      ieee80211_get_tkip_p1k(info->control.hw_key, skb_frag, phase1key);
+                       /* phase1key is in host endian. Copy to little-endian txhdr->iv. */
+                       for (i = 0; i < 5; i++) {
+                               txhdr->iv[i * 2 + 0] = phase1key[i];
+--- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
++++ b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+@@ -240,8 +240,7 @@ static void iwl4965_tx_cmd_build_hwcrypt
+ 
+       case WLAN_CIPHER_SUITE_TKIP:
+               tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
+-              ieee80211_get_tkip_key(keyconf, skb_frag,
+-                      IEEE80211_TKIP_P2_KEY, tx_cmd->key);
++              ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
+               IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
+               break;
+ 
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -497,8 +497,7 @@ static void iwlagn_tx_cmd_build_hwcrypto
+ 
+       case WLAN_CIPHER_SUITE_TKIP:
+               tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
+-              ieee80211_get_tkip_key(keyconf, skb_frag,
+-                      IEEE80211_TKIP_P2_KEY, tx_cmd->key);
++              ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
+               IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
+               break;

  
  

- #define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -960,21 +960,6 @@ enum sta_notify_cmd {
+ };

  
  

--#define AR_PHY_TX_IQCAL_START_9485            (AR_SM_BASE + 0x3c4)
--#define AR_PHY_TX_IQCAL_START_DO_CAL_9485     0x80000000
--#define AR_PHY_TX_IQCAL_START_DO_CAL_9485_S   31
--#define AR_PHY_TX_IQCAL_CONTROL_1_9485                (AR_SM_BASE + 0x3c8)
--#define AR_PHY_TX_IQCAL_STATUS_B0_9485                (AR_SM_BASE + 0x3f0)
+ /**
+- * enum ieee80211_tkip_key_type - get tkip key
+- *
+- * Used by drivers which need to get a tkip key for skb. Some drivers need a
+- * phase 1 key, others need a phase 2 key. A single function allows the driver
+- * to get the key, this enum indicates what type of key is required.
+- *
+- * @IEEE80211_TKIP_P1_KEY: the driver needs a phase 1 key
+- * @IEEE80211_TKIP_P2_KEY: the driver needs a phase 2 key
+- */
+-enum ieee80211_tkip_key_type {
+-      IEEE80211_TKIP_P1_KEY,
+-      IEEE80211_TKIP_P2_KEY,
+-};

 -
 -

--#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)
-+#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+                                               0x3c8 : 0x448)
-+#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+                                               0x3c4 : 0x440)
-+#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+                                               0x3f0 : 0x48c)
- #define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i)    (AR_SM_BASE + \
-                                            (AR_SREV_9485(ah) ? \
-                                             0x3d0 : 0x450) + ((_i) << 2))
-@@ -758,10 +755,10 @@
- #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT   0x01000000
- #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24
- #define AR_PHY_CHANNEL_STATUS_RX_CLEAR      0x00000004
--#define AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT             0x01fc0000
--#define AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT_S                   18
--#define AR_PHY_TX_IQCAL_START_DO_CAL        0x00000001
--#define AR_PHY_TX_IQCAL_START_DO_CAL_S      0
-+#define AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT             0x01fc0000
-+#define AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT_S                   18
-+#define AR_PHY_TX_IQCAL_START_DO_CAL      0x00000001
-+#define AR_PHY_TX_IQCAL_START_DO_CAL_S            0
- 
- #define AR_PHY_TX_IQCAL_STATUS_FAILED    0x00000001
- #define AR_PHY_CALIBRATED_GAINS_0      0x3e
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -453,6 +453,7 @@ void ath9k_btcoex_timer_pause(struct ath
- 
- #define ATH_LED_PIN_DEF               1
- #define ATH_LED_PIN_9287              8
-+#define ATH_LED_PIN_9300              10
- #define ATH_LED_PIN_9485              6
- 
- #ifdef CONFIG_MAC80211_LEDS
---- a/drivers/net/wireless/ath/ath9k/gpio.c
-+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -46,6 +46,8 @@ void ath_init_leds(struct ath_softc *sc)
-                       sc->sc_ah->led_pin = ATH_LED_PIN_9287;
-               else if (AR_SREV_9485(sc->sc_ah))
-                       sc->sc_ah->led_pin = ATH_LED_PIN_9485;
-+              else if (AR_SREV_9300(sc->sc_ah))
-+                      sc->sc_ah->led_pin = ATH_LED_PIN_9300;
-               else
-                       sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+-/**
+  * enum ieee80211_hw_flags - hardware flags
+  *
+  * These flags are used to indicate hardware capabilities to
+@@ -2568,21 +2553,33 @@ struct sk_buff *
+ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+ 
+ /**
+- * ieee80211_get_tkip_key - get a TKIP rc4 for skb
++ * ieee80211_get_tkip_p1k - get a TKIP phase 1 key
++ *
++ * This function returns the TKIP phase 1 key for the IV32 taken
++ * from the given packet.
++ *
++ * @keyconf: the parameter passed with the set key
++ * @skb: the packet to take the IV32 value from that will be encrypted
++ *    with this P1K
++ * @p1k: a buffer to which the key will be written, as 5 u16 values
++ */
++void ieee80211_get_tkip_p1k(struct ieee80211_key_conf *keyconf,
++                          struct sk_buff *skb, u16 *p1k);
++
++/**
++ * ieee80211_get_tkip_p2k - get a TKIP phase 2 key
+  *
+- * This function computes a TKIP rc4 key for an skb. It computes
+- * a phase 1 key if needed (iv16 wraps around). This function is to
+- * be used by drivers which can do HW encryption but need to compute
+- * to phase 1/2 key in SW.
++ * This function computes the TKIP RC4 key for the IV values
++ * in the packet.
+  *
+  * @keyconf: the parameter passed with the set key
+- * @skb: the skb for which the key is needed
+- * @type: TBD
+- * @key: a buffer to which the key will be written
+- */
+-void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
+-                              struct sk_buff *skb,
+-                              enum ieee80211_tkip_key_type type, u8 *key);
++ * @skb: the packet to take the IV32/IV16 values from that will be
++ *    encrypted with this key
++ * @p2k: a buffer to which the key will be written, 16 bytes
++ */
++void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
++                          struct sk_buff *skb, u8 *p2k);
++
+ /**
+  * ieee80211_wake_queue - wake specific queue
+  * @hw: pointer as obtained from ieee80211_alloc_hw().
+--- a/net/mac80211/key.c
++++ b/net/mac80211/key.c
+@@ -333,6 +333,7 @@ struct ieee80211_key *ieee80211_key_allo
+                                       get_unaligned_le16(seq);
+                       }
+               }
++              spin_lock_init(&key->u.tkip.txlock);
+               break;
+       case WLAN_CIPHER_SUITE_CCMP:
+               key->conf.iv_len = CCMP_HDR_LEN;
+--- a/net/mac80211/key.h
++++ b/net/mac80211/key.h
+@@ -52,9 +52,10 @@ enum ieee80211_internal_tkip_state {
+ };
+ 
+ struct tkip_ctx {
+-      u32 iv32;
+-      u16 iv16;
+-      u16 p1k[5];
++      u32 iv32;       /* current iv32 */
++      u16 iv16;       /* current iv16 */
++      u16 p1k[5];     /* p1k cache */
++      u32 p1k_iv32;   /* iv32 for which p1k computed */
+       enum ieee80211_internal_tkip_state state;
+ };
+ 
+@@ -71,6 +72,9 @@ struct ieee80211_key {
+ 
+       union {
+               struct {
++                      /* protects tx context */
++                      spinlock_t txlock;
++
+                       /* last used TSC */
+                       struct tkip_ctx tx;
+ 
+@@ -78,7 +82,7 @@ struct ieee80211_key {
+                       struct tkip_ctx rx[NUM_RX_DATA_QUEUES];
+               } tkip;
+               struct {
+-                      u8 tx_pn[6];
++                      atomic64_t tx_pn;
+                       /*
+                        * Last received packet number. The first
+                        * NUM_RX_DATA_QUEUES counters are used with Data
+@@ -88,12 +92,9 @@ struct ieee80211_key {
+                       u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6];
+                       struct crypto_cipher *tfm;
+                       u32 replays; /* dot11RSNAStatsCCMPReplays */
+-                      /* scratch buffers for virt_to_page() (crypto API) */
+ #ifndef AES_BLOCK_LEN
+ #define AES_BLOCK_LEN 16
+ #endif
+-                      u8 tx_crypto_buf[6 * AES_BLOCK_LEN];
+-                      u8 rx_crypto_buf[6 * AES_BLOCK_LEN];
+               } ccmp;
+               struct {
+                       u8 tx_pn[6];
+--- a/net/mac80211/tkip.c
++++ b/net/mac80211/tkip.c
+@@ -101,6 +101,7 @@ static void tkip_mixing_phase1(const u8 
+               p1k[4] += tkipS(p1k[3] ^ get_unaligned_le16(tk + 0 + j)) + i;

        }
        }

---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -868,6 +868,8 @@
- #define AR_SREV_9485_11(_ah) \
-       (AR_SREV_9485(_ah) && \
-        ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_11))
-+#define AR_SREV_9485_OR_LATER(_ah) \
-+      (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9485))
- 
- #define AR_SREV_9285E_20(_ah) \
-     (AR_SREV_9285_12_OR_LATER(_ah) && \
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -652,7 +652,7 @@ static void ieee80211_sta_reorder_releas
-  set_release_timer:
- 
-               mod_timer(&tid_agg_rx->reorder_timer,
--                        tid_agg_rx->reorder_time[j] +
-+                        tid_agg_rx->reorder_time[j] + 1 +
-                         HT_RX_REORDER_BUF_TIMEOUT);
-       } else {
-               del_timer(&tid_agg_rx->reorder_timer);
---- a/drivers/net/wireless/ath/ath9k/calib.c
-+++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -69,15 +69,21 @@ static void ath9k_hw_update_nfcal_hist_b
-                                             int16_t *nfarray)
+       ctx->state = TKIP_STATE_PHASE1_DONE;
++      ctx->p1k_iv32 = tsc_IV32;
+ }
+ 
+ static void tkip_mixing_phase2(const u8 *tk, struct tkip_ctx *ctx,
+@@ -140,60 +141,72 @@ static void tkip_mixing_phase2(const u8 
+ /* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets
+  * of the IV. Returns pointer to the octet following IVs (i.e., beginning of
+  * the packet payload). */
+-u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16)
++u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key)

  {
  {

-       struct ath_common *common = ath9k_hw_common(ah);
-+      struct ieee80211_conf *conf = &common->hw->conf;
-       struct ath_nf_limits *limit;
-       struct ath9k_nfcal_hist *h;
-       bool high_nf_mid = false;
-+      u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
-       int i;
- 
-       h = cal->nfCalHist;
-       limit = ath9k_hw_get_nf_limits(ah, ah->curchan);
- 
-       for (i = 0; i < NUM_NF_READINGS; i++) {
-+              if (!(chainmask & (1 << i)) ||
-+                  ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
-+                      continue;
+-      pos = write_tkip_iv(pos, iv16);
++      lockdep_assert_held(&key->u.tkip.txlock);

 +
 +

-               h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
++      pos = write_tkip_iv(pos, key->u.tkip.tx.iv16);
+       *pos++ = (key->conf.keyidx << 6) | (1 << 5) /* Ext IV */;
+       put_unaligned_le32(key->u.tkip.tx.iv32, pos);
+       return pos + 4;
+ }

  
  

-               if (++h[i].currIndex >= ATH9K_NF_CAL_HIST_MAX)
-@@ -225,6 +231,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
-       int32_t val;
-       u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
-       struct ath_common *common = ath9k_hw_common(ah);
-+      struct ieee80211_conf *conf = &common->hw->conf;
-       s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
+-void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
+-                      struct sk_buff *skb, enum ieee80211_tkip_key_type type,
+-                      u8 *outkey)
++static void ieee80211_compute_tkip_p1k(struct ieee80211_key *key, u32 iv32)
+ {
+-      struct ieee80211_key *key = (struct ieee80211_key *)
+-                      container_of(keyconf, struct ieee80211_key, conf);
+-      struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+-      u8 *data;
+-      const u8 *tk;
+-      struct tkip_ctx *ctx;
+-      u16 iv16;
+-      u32 iv32;
+-
+-      data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
+-      iv16 = data[2] | (data[0] << 8);
+-      iv32 = get_unaligned_le32(&data[4]);
+-
+-      tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
+-      ctx = &key->u.tkip.tx;
+-
+-#ifdef CONFIG_MAC80211_TKIP_DEBUG
+-      printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",
+-                      iv16, iv32);
++      struct ieee80211_sub_if_data *sdata = key->sdata;
++      struct tkip_ctx *ctx = &key->u.tkip.tx;
++      const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];

  
  

-       if (ah->caldata)
-@@ -234,6 +241,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
-               if (chainmask & (1 << i)) {
-                       s16 nfval;
+-      if (iv32 != ctx->iv32) {
+-              printk(KERN_DEBUG "skb: iv32 = 0x%08x key: iv32 = 0x%08x\n",
+-                      iv32, ctx->iv32);
+-              printk(KERN_DEBUG "Wrap around of iv16 in the middle of a "
+-                      "fragmented packet\n");
+-      }
+-#endif
++      lockdep_assert_held(&key->u.tkip.txlock);
+ 
+-      /* Update the p1k only when the iv16 in the packet wraps around, this
+-       * might occur after the wrap around of iv16 in the key in case of
+-       * fragmented packets. */
+-      if (iv16 == 0 || ctx->state == TKIP_STATE_NOT_INIT)
+-              tkip_mixing_phase1(tk, ctx, hdr->addr2, iv32);
++      /*
++       * Update the P1K when the IV32 is different from the value it
++       * had when we last computed it (or when not initialised yet).
++       * This might flip-flop back and forth if packets are processed
++       * out-of-order due to the different ACs, but then we have to
++       * just compute the P1K more often.
++       */
++      if (ctx->p1k_iv32 != iv32 || ctx->state == TKIP_STATE_NOT_INIT)
++              tkip_mixing_phase1(tk, ctx, sdata->vif.addr, iv32);
++}
+ 
+-      if (type == IEEE80211_TKIP_P1_KEY) {
+-              memcpy(outkey, ctx->p1k, sizeof(u16) * 5);
+-              return;
+-      }
++void ieee80211_get_tkip_p1k(struct ieee80211_key_conf *keyconf,
++                          struct sk_buff *skb, u16 *p1k)
++{
++      struct ieee80211_key *key = (struct ieee80211_key *)
++                      container_of(keyconf, struct ieee80211_key, conf);
++      struct tkip_ctx *ctx = &key->u.tkip.tx;
++      struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
++      const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
++      u32 iv32 = get_unaligned_le32(&data[4]);
++      unsigned long flags;
++
++      spin_lock_irqsave(&key->u.tkip.txlock, flags);
++      ieee80211_compute_tkip_p1k(key, iv32);
++      memcpy(p1k, ctx->p1k, sizeof(ctx->p1k));
++      spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
++}
++EXPORT_SYMBOL(ieee80211_get_tkip_p1k);

  
  

-+                      if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+                              continue;
+-      tkip_mixing_phase2(tk, ctx, iv16, outkey);
++void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
++                          struct sk_buff *skb, u8 *p2k)
++{
++      struct ieee80211_key *key = (struct ieee80211_key *)
++                      container_of(keyconf, struct ieee80211_key, conf);
++      const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
++      struct tkip_ctx *ctx = &key->u.tkip.tx;
++      struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
++      const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
++      u32 iv32 = get_unaligned_le32(&data[4]);
++      u16 iv16 = data[2] | (data[0] << 8);
++      unsigned long flags;

 +
 +

-                       if (h)
-                               nfval = h[i].privNF;
-                       else
-@@ -293,6 +303,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
-       ENABLE_REGWRITE_BUFFER(ah);
-       for (i = 0; i < NUM_NF_READINGS; i++) {
-               if (chainmask & (1 << i)) {
-+                      if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+                              continue;
++      spin_lock_irqsave(&key->u.tkip.txlock, flags);
++      ieee80211_compute_tkip_p1k(key, iv32);
++      tkip_mixing_phase2(tk, ctx, iv16, p2k);
++      spin_unlock_irqrestore(&key->u.tkip.txlock, flags);
+ }
+-EXPORT_SYMBOL(ieee80211_get_tkip_key);
++EXPORT_SYMBOL(ieee80211_get_tkip_p2k);
+ 
+ /*
+  * Encrypt packet payload with TKIP using @key. @pos is a pointer to the
+@@ -204,19 +217,15 @@ EXPORT_SYMBOL(ieee80211_get_tkip_key);
+  */
+ int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
+                               struct ieee80211_key *key,
+-                              u8 *pos, size_t payload_len, u8 *ta)
++                              struct sk_buff *skb,
++                              u8 *payload, size_t payload_len)
+ {
+       u8 rc4key[16];
+-      struct tkip_ctx *ctx = &key->u.tkip.tx;
+-      const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
+-
+-      /* Calculate per-packet key */
+-      if (ctx->iv16 == 0 || ctx->state == TKIP_STATE_NOT_INIT)
+-              tkip_mixing_phase1(tk, ctx, ta, ctx->iv32);
+ 
+-      tkip_mixing_phase2(tk, ctx, ctx->iv16, rc4key);
++      ieee80211_get_tkip_p2k(&key->conf, skb, rc4key);
+ 
+-      return ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len);
++      return ieee80211_wep_encrypt_data(tfm, rc4key, 16,
++                                        payload, payload_len);
+ }
+ 
+ /* Decrypt packet payload with TKIP using @key. @pos is a pointer to the
+--- a/net/mac80211/tkip.h
++++ b/net/mac80211/tkip.h
+@@ -13,11 +13,13 @@
+ #include <linux/crypto.h>
+ #include "key.h"
+ 
+-u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16);
++u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key);
+ 
+ int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
+-                               struct ieee80211_key *key,
+-                               u8 *pos, size_t payload_len, u8 *ta);
++                              struct ieee80211_key *key,
++                              struct sk_buff *skb,
++                              u8 *payload, size_t payload_len);

 +
 +

-                       val = REG_READ(ah, ah->nf_regs[i]);
-                       val &= 0xFFFFFE00;
-                       val |= (((u32) (-50) << 1) & 0x1ff);
+ enum {
+       TKIP_DECRYPT_OK = 0,
+       TKIP_DECRYPT_NO_EXT_IV = -1,
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -209,6 +209,7 @@ static int ieee80211_get_key(struct wiph
+       u8 seq[6] = {0};
+       struct key_params params;
+       struct ieee80211_key *key = NULL;
++      u64 pn64;
+       u32 iv32;
+       u16 iv16;
+       int err = -ENOENT;
+@@ -256,12 +257,13 @@ static int ieee80211_get_key(struct wiph
+               params.seq_len = 6;
+               break;
+       case WLAN_CIPHER_SUITE_CCMP:
+-              seq[0] = key->u.ccmp.tx_pn[5];
+-              seq[1] = key->u.ccmp.tx_pn[4];
+-              seq[2] = key->u.ccmp.tx_pn[3];
+-              seq[3] = key->u.ccmp.tx_pn[2];
+-              seq[4] = key->u.ccmp.tx_pn[1];
+-              seq[5] = key->u.ccmp.tx_pn[0];
++              pn64 = atomic64_read(&key->u.ccmp.tx_pn);
++              seq[0] = pn64;
++              seq[1] = pn64 >> 8;
++              seq[2] = pn64 >> 16;
++              seq[3] = pn64 >> 24;
++              seq[4] = pn64 >> 32;
++              seq[5] = pn64 >> 40;
+               params.seq = seq;
+               params.seq_len = 6;
+               break;
+--- a/net/mac80211/debugfs_key.c
++++ b/net/mac80211/debugfs_key.c
+@@ -79,6 +79,7 @@ static ssize_t key_tx_spec_read(struct f
+                               size_t count, loff_t *ppos)
+ {
+       const u8 *tpn;
++      u64 pn;
+       char buf[20];
+       int len;
+       struct ieee80211_key *key = file->private_data;
+@@ -94,9 +95,10 @@ static ssize_t key_tx_spec_read(struct f
+                               key->u.tkip.tx.iv16);
+               break;
+       case WLAN_CIPHER_SUITE_CCMP:
+-              tpn = key->u.ccmp.tx_pn;
++              pn = atomic64_read(&key->u.ccmp.tx_pn);
+               len = scnprintf(buf, sizeof(buf), "%02x%02x%02x%02x%02x%02x\n",
+-                              tpn[0], tpn[1], tpn[2], tpn[3], tpn[4], tpn[5]);
++                              (u8)(pn >> 40), (u8)(pn >> 32), (u8)(pn >> 24),
++                              (u8)(pn >> 16), (u8)(pn >> 8), (u8)pn);
+               break;
+       case WLAN_CIPHER_SUITE_AES_CMAC:
+               tpn = key->u.aes_cmac.tx_pn;
+--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -653,8 +653,8 @@ static const u32 ar9300_2p2_baseband_pos
+       {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+       {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+       {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+-      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
+-      {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
++      {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
++      {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
+       {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+       {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+       {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+@@ -761,7 +761,7 @@ static const u32 ar9300_2p2_baseband_cor
+       {0x0000a3ec, 0x20202020},
+       {0x0000a3f0, 0x00000000},
+       {0x0000a3f4, 0x00000246},
+-      {0x0000a3f8, 0x0cdbd380},
++      {0x0000a3f8, 0x0c9bd380},
+       {0x0000a3fc, 0x000f0f01},
+       {0x0000a400, 0x8fa91f01},
+       {0x0000a404, 0x00000000},
+@@ -780,7 +780,7 @@ static const u32 ar9300_2p2_baseband_cor
+       {0x0000a43c, 0x00100000},
+       {0x0000a440, 0x00000000},
+       {0x0000a444, 0x00000000},
+-      {0x0000a448, 0x06000080},
++      {0x0000a448, 0x05000080},
+       {0x0000a44c, 0x00000001},
+       {0x0000a450, 0x00010000},
+       {0x0000a458, 0x00000000},
+@@ -1500,8 +1500,6 @@ static const u32 ar9300_2p2_mac_core[][2
+       {0x0000816c, 0x00000000},
+       {0x000081c0, 0x00000000},
+       {0x000081c4, 0x33332210},
+-      {0x000081c8, 0x00000000},
+-      {0x000081cc, 0x00000000},
+       {0x000081ec, 0x00000000},
+       {0x000081f0, 0x00000000},
+       {0x000081f4, 0x00000000},