mac80211: fix a compiler warning

[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 982e233..a36f99c 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,353 +1,1645 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at
-       if (!caldata || !caldata->paprd_done)
-               return;
+--- 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);

  
  

--      ath9k_ps_wakeup(sc);
-       ar9003_paprd_enable(ah, false);
-       for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-               if (!(common->tx_chainmask & BIT(chain)))
-@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at
+       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);

        }
  
        }
  

-       ar9003_paprd_enable(ah, true);
--      ath9k_ps_restore(sc);
+       /* 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;
+ 
+       if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
+@@ -809,7 +811,7 @@ void ieee80211_process_addba_resp(struct
+                * of at least 1.
+                */
+               if (!buf_size)
+-                      goto out;
++                      buf_size = 1;
+ 
+               if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED,
+                                    &tid_tx->state)) {
+--- 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_
+ {
+       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;
+-              }
+-
+-              /* no locking required since STA is not live yet */
+-              sta->flags |= WLAN_STA_AUTHORIZED;
+-
+-              res = sta_info_insert(sta);
+-              if (res) {
+-                      /* STA has been freed */
+-                      goto err_del_interface;
+-              }
+-
+-              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);
++
+  err_stop:
+       if (!local->open_count)
+               drv_stop(local);
+@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+       dev->destructor = free_netdev;

  }
  
  }
  

- static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
-@@ -554,8 +552,11 @@ set_timer:
-       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
-               if (!ah->caldata->paprd_done)
-                       ieee80211_queue_work(sc->hw, &sc->paprd_work);
--              else if (!ah->paprd_table_write_done)
-+              else if (!ah->paprd_table_write_done) {
-+                      ath9k_ps_wakeup(sc);
-                       ath_paprd_activate(sc);
-+                      ath9k_ps_restore(sc);
++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;
++      }
++
++      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);
++      }
++
++      rcu_read_unlock();
++}
++
+ static void ieee80211_iface_work(struct work_struct *work)
+ {
+       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;
++
+               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);

 +              }
        }
  }
  
 +              }
        }
  }
  

-@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat
+--- 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;

  
  

-       ath9k_calculate_iter_data(hw, vif, &iter_data);
+@@ -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)

  
  

--      ath9k_ps_wakeup(sc);
-       /* Set BSSID mask. */
-       memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
-       ath_hw_setbssidmask(common);
-@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat
+       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;

        }
  
        }
  

-       ath9k_hw_set_interrupts(ah, ah->imask);
--      ath9k_ps_restore(sc);
- 
-       /* Set up ANI */
-       if ((iter_data.naps + iter_data.nadhocs) > 0) {
-@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie
-       struct ath_vif *avp = (void *)vif->drv_priv;
-       int ret = 0;
- 
-+      ath9k_ps_wakeup(sc);
-       mutex_lock(&sc->mutex);
- 
-       switch (vif->type) {
-@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie
-       ath9k_do_vif_add_setup(hw, vif);
- out:
-       mutex_unlock(&sc->mutex);
-+      ath9k_ps_restore(sc);
-       return ret;
- }
+@@ -980,7 +987,6 @@ int ath_reset(struct ath_softc *sc, bool
+       del_timer_sync(&common->ani.timer);

  
  

-@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct
+       ath9k_ps_wakeup(sc);
+-      spin_lock_bh(&sc->sc_pcu_lock);

  
  

-       ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");
-       mutex_lock(&sc->mutex);
-+      ath9k_ps_wakeup(sc);
+       ieee80211_stop_queues(hw);

  
  

-       /* See if new interface type is valid. */
-       if ((new_type == NL80211_IFTYPE_ADHOC) &&
-@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct
+@@ -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();

  
  

-       ath9k_do_vif_add_setup(hw, vif);
- out:
-+      ath9k_ps_restore(sc);
-       mutex_unlock(&sc->mutex);
-       return ret;
+-      if (needreset) {
+-              spin_unlock_bh(&sc->sc_pcu_lock);
++      if (needreset)
+               ath_reset(sc, false);
+-              spin_lock_bh(&sc->sc_pcu_lock);
+-      }

  }
  }

-@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc

  
  

-       ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
+ 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);
+       }

  
  

-+      ath9k_ps_wakeup(sc);
-       mutex_lock(&sc->mutex);
+       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));

  
  

-       sc->nvifs--;
-@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc
-       ath9k_calculate_summary_state(hw, NULL);
+-      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)
+ {
+-      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;

  
  

-       mutex_unlock(&sc->mutex);
-+      ath9k_ps_restore(sc);
+       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;
++      }
+ 
+-      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);

  
  

- static void ath9k_enable_ps(struct ath_softc *sc)
-@@ -1809,6 +1814,7 @@ static int ath9k_conf_tx(struct ieee8021
+       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

  
  

-       txq = sc->tx.txq_map[queue];
++#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);

  
  

-+      ath9k_ps_wakeup(sc);
-       mutex_lock(&sc->mutex);
+ #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;

  
  

-       memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
-@@ -1832,6 +1838,7 @@ static int ath9k_conf_tx(struct ieee8021
-                       ath_beaconq_config(sc);
+-              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];

  
  

-       mutex_unlock(&sc->mutex);
-+      ath9k_ps_restore(sc);
+-                      if (pd != NULL) {
+-                              kfree(pd->pd_step);
+-                              kfree(pd->pd_pwr);
+-                      }
++                      kfree(pd->pd_step);
++                      kfree(pd->pd_pwr);
+               }

  
  

-       return ret;
+               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 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);
+ 
+-      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;
++
++      /* 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++;
+-
+-      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);

  }
  }

-@@ -1908,6 +1915,7 @@ static void ath9k_bss_info_changed(struc
-       int slottime;
-       int error;

  
  

-+      ath9k_ps_wakeup(sc);
-       mutex_lock(&sc->mutex);

  
  

-       if (changed & BSS_CHANGED_BSSID) {
-@@ -2008,6 +2016,7 @@ static void ath9k_bss_info_changed(struc
+@@ -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;
++
++      /* 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);
++
+       b_0 = scratch + 3 * AES_BLOCK_LEN;
+       aad = scratch + 4 * AES_BLOCK_LEN;
+ 
+@@ -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];
+ 
+       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;
+ 
+       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

        }
  
        }
  

-       mutex_unlock(&sc->mutex);
-+      ath9k_ps_restore(sc);
- }
+       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);

  
  

- static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da
-       tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
-       tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
-       slot = (tsftu % (intval * ATH_BCBUF)) / intval;
--      /*
--       * Reverse the slot order to get slot 0 on the TBTT offset that does
--       * not require TSF adjustment and other slots adding
--       * slot/ATH_BCBUF * beacon_int to timestamp. For example, with
--       * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..
--       * and slot 0 is at correct offset to TBTT.
--       */
--      slot = ATH_BCBUF - slot - 1;
-       vif = sc->beacon.bslot[slot];
- 
-       ath_dbg(common, ATH_DBG_BEACON,
-@@ -708,7 +700,7 @@ void ath_beacon_config(struct ath_softc 
-       if (cur_conf->dtim_period == 0)
-               cur_conf->dtim_period = 1;
- 
--      switch (iftype) {
-+      switch (sc->sc_ah->opmode) {
-       case NL80211_IFTYPE_AP:
-               ath_beacon_config_ap(sc, cur_conf);
+               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;
                break;

---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -1585,7 +1585,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
+ 
+--- 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;
+ 
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -960,21 +960,6 @@ enum sta_notify_cmd {
+ };
+ 
+ /**
+- * 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,
+-};
+-
+-/**
+  * 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;
+       }
+       ctx->state = TKIP_STATE_PHASE1_DONE;
++      ctx->p1k_iv32 = tsc_IV32;

  }
  
  }
  

- static int
--__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
-+__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
+ 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 ieee80211_sub_if_data *sdata = rx->sdata;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
-@@ -1593,6 +1593,7 @@ __ieee80211_data_to_8023(struct ieee8021
-       struct ethhdr *ehdr;
-       int ret;
- 
-+      *port_control = false;
-       if (ieee80211_has_a4(hdr->frame_control) &&
-           sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
-               return -1;
-@@ -1611,11 +1612,13 @@ __ieee80211_data_to_8023(struct ieee8021
-               return -1;
- 
-       ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
--      if (ret < 0 || !check_port_control)
-+      if (ret < 0)
-               return ret;
- 
-       ehdr = (struct ethhdr *) rx->skb->data;
--      if (ehdr->h_proto != rx->sdata->control_port_protocol)
-+      if (ehdr->h_proto == rx->sdata->control_port_protocol)
-+              *port_control = true;
-+      else if (check_port_control)
-               return -1;
+-      pos = write_tkip_iv(pos, iv16);
++      lockdep_assert_held(&key->u.tkip.txlock);
++
++      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;
+ }

  
  

-       return 0;
-@@ -1916,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
-       struct net_device *dev = sdata->dev;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
-       __le16 fc = hdr->frame_control;
-+      bool port_control;
-       int err;
- 
-       if (unlikely(!ieee80211_is_data(hdr->frame_control)))
-@@ -1932,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
-           sdata->vif.type == NL80211_IFTYPE_AP)
-               return RX_DROP_MONITOR;
+-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];

  
  

--      err = __ieee80211_data_to_8023(rx);
-+      err = __ieee80211_data_to_8023(rx, &port_control);
-       if (unlikely(err))
-               return RX_DROP_UNUSABLE;
+-      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);

  
  

-       if (!ieee80211_frame_allowed(rx, fc))
-               return RX_DROP_MONITOR;
+-      /* 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 (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
-+          unlikely(port_control) && sdata->bss) {
-+              sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
-+                                   u.ap);
-+              dev = sdata->dev;
-+              rx->sdata = sdata;
-+      }
+-      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;

 +
 +

-       rx->skb->dev = dev;
++      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);

  
  

-       dev->stats.rx_packets++;
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -75,7 +75,6 @@ static void ath_rx_buf_link(struct ath_s
-               *sc->rx.rxlink = bf->bf_daddr;
+-      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;
++
++      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);

  
  

-       sc->rx.rxlink = &ds->ds_link;
--      ath9k_hw_rxena(ah);
+ /*
+  * 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);

  }
  
  }
  

- static void ath_setdefantenna(struct ath_softc *sc, u32 antenna)
-@@ -426,9 +425,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
-       else
-               rfilt |= ATH9K_RX_FILTER_BEACON;
+ /* 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"

  
  

--      if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||
--          AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&
--          (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
-+      if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
-           (sc->rx.rxfilter & FIF_PSPOLL))
-               rfilt |= ATH9K_RX_FILTER_PSPOLL;
+-u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16);
++u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key);

  
  

-@@ -486,12 +483,12 @@ start_recv:
- bool ath_stoprecv(struct ath_softc *sc)
+ 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);
++
+ 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)

  {
  {

-       struct ath_hw *ah = sc->sc_ah;
--      bool stopped;
-+      bool stopped, reset = false;
- 
-       spin_lock_bh(&sc->rx.rxbuflock);
-       ath9k_hw_abortpcurecv(ah);
-       ath9k_hw_setrxfilter(ah, 0);
--      stopped = ath9k_hw_stopdmarecv(ah);
-+      stopped = ath9k_hw_stopdmarecv(ah, &reset);
- 
-       if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-               ath_edma_stop_recv(sc);
-@@ -506,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc)
-                       "confusing the DMA engine when we start RX up\n");
-               ATH_DBG_WARN_ON_ONCE(!stopped);
+       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},
+--- a/net/mac80211/work.c
++++ b/net/mac80211/work.c
+@@ -1075,14 +1075,13 @@ static void ieee80211_work_work(struct w
+                       continue;
+               if (wk->chan != local->tmp_channel)
+                       continue;
+-              if (ieee80211_work_ct_coexists(wk->chan_type,
+-                                             local->tmp_channel_type))
++              if (!ieee80211_work_ct_coexists(wk->chan_type,
++                                              local->tmp_channel_type))
+                       continue;
+               remain_off_channel = true;
+       }
+ 
+       if (!remain_off_channel && local->tmp_channel) {
+-              bool on_oper_chan = ieee80211_cfg_on_oper_channel(local);
+               local->tmp_channel = NULL;
+               /* If tmp_channel wasn't operating channel, then
+                * we need to go back on-channel.
+@@ -1092,7 +1091,7 @@ static void ieee80211_work_work(struct w
+                * we still need to do a hardware config.  Currently,
+                * we cannot be here while scanning, however.
+                */
+-              if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan)
++              if (!ieee80211_cfg_on_oper_channel(local))
+                       ieee80211_hw_config(local, 0);
+ 
+               /* At the least, we need to disable offchannel_ps,
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -627,6 +627,11 @@ static void ar5008_hw_init_bb(struct ath
+       else
+               synthDelay /= 10;
+ 
++      if (IS_CHAN_HALF_RATE(chan))
++              synthDelay *= 2;
++      else if (IS_CHAN_QUARTER_RATE(chan))
++              synthDelay *= 4;
++
+       REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+ 
+       udelay(synthDelay + BASE_ACTIVATE_DELAY);
+--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
++++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+@@ -499,45 +499,6 @@ void ar9002_hw_enable_async_fifo(struct 

        }
        }

--      return stopped;
-+      return stopped && !reset;

  }
  
  }
  

- void ath_flushrecv(struct ath_softc *sc)
-@@ -1767,6 +1764,7 @@ requeue:
-               } else {
-                       list_move_tail(&bf->list, &sc->rx.rxbuf);
-                       ath_rx_buf_link(sc, bf);
-+                      ath9k_hw_rxena(ah);
+-/*
+- * If Async FIFO is enabled, the following counters change as MAC now runs
+- * at 117 Mhz instead of 88/44MHz when async FIFO is disabled.
+- *
+- * The values below tested for ht40 2 chain.
+- * Overwrite the delay/timeouts initialized in process ini.
+- */
+-void ar9002_hw_update_async_fifo(struct ath_hw *ah)
+-{
+-      if (AR_SREV_9287_13_OR_LATER(ah)) {
+-              REG_WRITE(ah, AR_D_GBL_IFS_SIFS,
+-                        AR_D_GBL_IFS_SIFS_ASYNC_FIFO_DUR);
+-              REG_WRITE(ah, AR_D_GBL_IFS_SLOT,
+-                        AR_D_GBL_IFS_SLOT_ASYNC_FIFO_DUR);
+-              REG_WRITE(ah, AR_D_GBL_IFS_EIFS,
+-                        AR_D_GBL_IFS_EIFS_ASYNC_FIFO_DUR);
+-
+-              REG_WRITE(ah, AR_TIME_OUT, AR_TIME_OUT_ACK_CTS_ASYNC_FIFO_DUR);
+-              REG_WRITE(ah, AR_USEC, AR_USEC_ASYNC_FIFO_DUR);
+-
+-              REG_SET_BIT(ah, AR_MAC_PCU_LOGIC_ANALYZER,
+-                          AR_MAC_PCU_LOGIC_ANALYZER_DISBUG20768);
+-              REG_RMW_FIELD(ah, AR_AHB_MODE, AR_AHB_CUSTOM_BURST_EN,
+-                            AR_AHB_CUSTOM_BURST_ASYNC_FIFO_VAL);
+-      }
+-}
+-
+-/*
+- * We don't enable WEP aggregation on mac80211 but we keep this
+- * around for HAL unification purposes.
+- */
+-void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah)
+-{
+-      if (AR_SREV_9287_13_OR_LATER(ah)) {
+-              REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
+-                          AR_PCU_MISC_MODE2_ENABLE_AGGWEP);
+-      }
+-}
+-
+ /* Sets up the AR5008/AR9001/AR9002 hardware familiy callbacks */
+ void ar9002_hw_attach_ops(struct ath_hw *ah)
+ {
+--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+@@ -111,7 +111,9 @@ static int ar9002_hw_set_channel(struct 
+ 
+               switch (ah->eep_ops->get_eeprom(ah, EEP_FRAC_N_5G)) {
+               case 0:
+-                      if ((freq % 20) == 0)
++                      if (IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))
++                              aModeRefSel = 0;
++                      else if ((freq % 20) == 0)
+                               aModeRefSel = 3;
+                       else if ((freq % 10) == 0)
+                               aModeRefSel = 2;
+@@ -129,8 +131,9 @@ static int ar9002_hw_set_channel(struct 
+                       channelSel = CHANSEL_5G(freq);
+ 
+                       /* RefDivA setting */
+-                      REG_RMW_FIELD(ah, AR_AN_SYNTH9,
+-                                    AR_AN_SYNTH9_REFDIVA, refDivA);
++                      ath9k_hw_analog_shift_rmw(ah, AR_AN_SYNTH9,
++                                    AR_AN_SYNTH9_REFDIVA,
++                                    AR_AN_SYNTH9_REFDIVA_S, refDivA);
+ 

                }
                }

-       } while (1);

  
  

---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-       ah->txchainmask = common->tx_chainmask;
-       ah->rxchainmask = common->rx_chainmask;
- 
--      if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
--              ath9k_hw_abortpcurecv(ah);
--              if (!ath9k_hw_stopdmarecv(ah)) {
--                      ath_dbg(common, ATH_DBG_XMIT,
--                              "Failed to stop receive dma\n");
--                      bChannelChange = false;
--              }
+@@ -447,26 +450,27 @@ static void ar9002_olc_init(struct ath_h
+ static u32 ar9002_hw_compute_pll_control(struct ath_hw *ah,
+                                        struct ath9k_channel *chan)
+ {
++      int ref_div = 5;
++      int pll_div = 0x2c;
+       u32 pll;
+ 
+-      pll = SM(0x5, AR_RTC_9160_PLL_REFDIV);
++      if (chan && IS_CHAN_5GHZ(chan) && !IS_CHAN_A_FAST_CLOCK(ah, chan)) {
++              if (AR_SREV_9280_20(ah)) {
++                      ref_div = 10;
++                      pll_div = 0x50;
++              } else {
++                      pll_div = 0x28;
++              }
++      }
++
++      pll = SM(ref_div, AR_RTC_9160_PLL_REFDIV);
++      pll |= SM(pll_div, AR_RTC_9160_PLL_DIV);
+ 
+       if (chan && IS_CHAN_HALF_RATE(chan))
+               pll |= SM(0x1, AR_RTC_9160_PLL_CLKSEL);
+       else if (chan && IS_CHAN_QUARTER_RATE(chan))
+               pll |= SM(0x2, AR_RTC_9160_PLL_CLKSEL);
+ 
+-      if (chan && IS_CHAN_5GHZ(chan)) {
+-              if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+-                      pll = 0x142c;
+-              else if (AR_SREV_9280_20(ah))
+-                      pll = 0x2850;
+-              else
+-                      pll |= SM(0x28, AR_RTC_9160_PLL_DIV);
+-      } else {
+-              pll |= SM(0x2c, AR_RTC_9160_PLL_DIV);

 -      }
 -
 -      }
 -

-       if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
-               return -EIO;
+       return pll;
+ }

  
  

---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -710,27 +710,46 @@ void ath9k_hw_abortpcurecv(struct ath_hw
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -87,7 +87,10 @@ static void ath9k_hw_set_clockrate(struc
+       struct ath_common *common = ath9k_hw_common(ah);
+       unsigned int clockrate;
+ 
+-      if (!ah->curchan) /* should really check for CCK instead */
++      /* AR9287 v1.3+ uses async FIFO and runs the MAC at 117 MHz */
++      if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah))
++              clockrate = 117;
++      else 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;
+@@ -99,6 +102,13 @@ static void ath9k_hw_set_clockrate(struc
+       if (conf_is_ht40(conf))
+               clockrate *= 2;
+ 
++      if (ah->curchan) {
++              if (IS_CHAN_HALF_RATE(ah->curchan))
++                      clockrate /= 2;
++              if (IS_CHAN_QUARTER_RATE(ah->curchan))
++                      clockrate /= 4;
++      }
++
+       common->clockrate = clockrate;

  }
  }

- EXPORT_SYMBOL(ath9k_hw_abortpcurecv);

  
  

--bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
-+bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
+@@ -895,6 +905,13 @@ static void ath9k_hw_init_interrupt_mask
+       }
+ }
+ 
++static void ath9k_hw_set_sifs_time(struct ath_hw *ah, u32 us)
++{
++      u32 val = ath9k_hw_mac_to_clks(ah, us - 2);
++      val = min(val, (u32) 0xFFFF);
++      REG_WRITE(ah, AR_D_GBL_IFS_SIFS, val);
++}
++
+ static void ath9k_hw_setslottime(struct ath_hw *ah, u32 us)

  {
  {

- #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
-       struct ath_common *common = ath9k_hw_common(ah);
-+      u32 mac_status, last_mac_status = 0;
-       int i;
+       u32 val = ath9k_hw_mac_to_clks(ah, us);
+@@ -932,25 +949,60 @@ static bool ath9k_hw_set_global_txtimeou

  
  

-+      /* Enable access to the DMA observation bus */
-+      REG_WRITE(ah, AR_MACMISC,
-+                ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
-+                 (AR_MACMISC_MISC_OBS_BUS_1 <<
-+                  AR_MACMISC_MISC_OBS_BUS_MSB_S)));
+ void ath9k_hw_init_global_settings(struct ath_hw *ah)
+ {
+-      struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
++      struct ath_common *common = ath9k_hw_common(ah);
++      struct ieee80211_conf *conf = &common->hw->conf;
++      const struct ath9k_channel *chan = ah->curchan;
+       int acktimeout;
+       int slottime;
+       int sifstime;
++      int rx_lat = 0, tx_lat = 0, eifs = 0;
++      u32 reg;
+ 
+       ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET, "ah->misc_mode 0x%x\n",
+               ah->misc_mode);
+ 
++      if (!chan)
++              return;

 +
 +

-       REG_WRITE(ah, AR_CR, AR_CR_RXD);
+       if (ah->misc_mode != 0)
+               REG_SET_BIT(ah, AR_PCU_MISC, ah->misc_mode);

  
  

-       /* Wait for rx enable bit to go low */
-       for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) {
-               if ((REG_READ(ah, AR_CR) & AR_CR_RXE) == 0)
-                       break;
+-      if (conf->channel && conf->channel->band == IEEE80211_BAND_5GHZ)
+-              sifstime = 16;
+-      else
+-              sifstime = 10;
++      rx_lat = 37;
++      tx_lat = 54;

 +
 +

-+              if (!AR_SREV_9300_20_OR_LATER(ah)) {
-+                      mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0;
-+                      if (mac_status == 0x1c0 && mac_status == last_mac_status) {
-+                              *reset = true;
-+                              break;
-+                      }
++      if (IS_CHAN_HALF_RATE(chan)) {
++              eifs = 175;
++              rx_lat *= 2;
++              tx_lat *= 2;
++              if (IS_CHAN_A_FAST_CLOCK(ah, chan))
++                  tx_lat += 11;

 +
 +

-+                      last_mac_status = mac_status;
-+              }
++              slottime = 13;
++              sifstime = 32;
++      } else if (IS_CHAN_QUARTER_RATE(chan)) {
++              eifs = 340;
++              rx_lat *= 4;
++              tx_lat *= 4;
++              if (IS_CHAN_A_FAST_CLOCK(ah, chan))
++                  tx_lat += 22;
++
++              slottime = 21;
++              sifstime = 64;
++      } else {
++              eifs = REG_READ(ah, AR_D_GBL_IFS_EIFS);
++              reg = REG_READ(ah, AR_USEC);
++              rx_lat = MS(reg, AR_USEC_RX_LAT);
++              tx_lat = MS(reg, AR_USEC_TX_LAT);
++
++              slottime = ah->slottime;
++              if (IS_CHAN_5GHZ(chan))
++                      sifstime = 16;
++              else
++                      sifstime = 10;
++      }
+ 
+       /* As defined by IEEE 802.11-2007 17.3.8.6 */
+-      slottime = ah->slottime + 3 * ah->coverage_class;
+-      acktimeout = slottime + sifstime;
++      acktimeout = slottime + sifstime + 3 * ah->coverage_class;
+ 
+       /*
+        * Workaround for early ACK timeouts, add an offset to match the
+@@ -962,11 +1014,20 @@ void ath9k_hw_init_global_settings(struc
+       if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
+               acktimeout += 64 - sifstime - ah->slottime;
+ 
+-      ath9k_hw_setslottime(ah, ah->slottime);
++      ath9k_hw_set_sifs_time(ah, sifstime);
++      ath9k_hw_setslottime(ah, slottime);
+       ath9k_hw_set_ack_timeout(ah, acktimeout);
+       ath9k_hw_set_cts_timeout(ah, acktimeout);
+       if (ah->globaltxtimeout != (u32) -1)
+               ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);
++
++      REG_WRITE(ah, AR_D_GBL_IFS_EIFS, ath9k_hw_mac_to_clks(ah, eifs));
++      REG_RMW(ah, AR_USEC,
++              (common->clockrate - 1) |
++              SM(rx_lat, AR_USEC_RX_LAT) |
++              SM(tx_lat, AR_USEC_TX_LAT),
++              AR_USEC_TX_LAT | AR_USEC_RX_LAT | AR_USEC_USEC);

 +
 +

-               udelay(AH_TIME_QUANTUM);
+ }
+ EXPORT_SYMBOL(ath9k_hw_init_global_settings);
+ 
+@@ -1570,9 +1631,13 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 
+       ath9k_hw_init_global_settings(ah);
+ 
+-      if (!AR_SREV_9300_20_OR_LATER(ah)) {
+-              ar9002_hw_update_async_fifo(ah);
+-              ar9002_hw_enable_wep_aggregation(ah);
++      if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
++              REG_SET_BIT(ah, AR_MAC_PCU_LOGIC_ANALYZER,
++                          AR_MAC_PCU_LOGIC_ANALYZER_DISBUG20768);
++              REG_RMW_FIELD(ah, AR_AHB_MODE, AR_AHB_CUSTOM_BURST_EN,
++                            AR_AHB_CUSTOM_BURST_ASYNC_FIFO_VAL);
++              REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
++                          AR_PCU_MISC_MODE2_ENABLE_AGGWEP);

        }
  
        }
  

-       if (i == 0) {
-               ath_err(common,
--                      "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
-+                      "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
-                       AH_RX_STOP_DMA_TIMEOUT / 1000,
-                       REG_READ(ah, AR_CR),
--                      REG_READ(ah, AR_DIAG_SW));
-+                      REG_READ(ah, AR_DIAG_SW),
-+                      REG_READ(ah, AR_DMADBG_7));
-               return false;
+       REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
+@@ -1932,12 +1997,22 @@ EXPORT_SYMBOL(ath9k_hw_set_sta_beacon_ti
+ /* HW Capabilities */
+ /*******************/
+ 
++static u8 fixup_chainmask(u8 chip_chainmask, u8 eeprom_chainmask)
++{
++      eeprom_chainmask &= chip_chainmask;
++      if (eeprom_chainmask)
++              return eeprom_chainmask;
++      else
++              return chip_chainmask;
++}
++
+ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
+ {
+       struct ath9k_hw_capabilities *pCap = &ah->caps;
+       struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
+       struct ath_common *common = ath9k_hw_common(ah);
+       struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
++      unsigned int chip_chainmask;
+ 
+       u16 eeval;
+       u8 ant_div_ctl1, tx_chainmask, rx_chainmask;
+@@ -1974,6 +2049,15 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+       if (eeval & AR5416_OPFLAGS_11G)
+               pCap->hw_caps |= ATH9K_HW_CAP_2GHZ;
+ 
++      if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah))
++              chip_chainmask = 1;
++      else if (!AR_SREV_9280_20_OR_LATER(ah))
++              chip_chainmask = 7;
++      else if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9340(ah))
++              chip_chainmask = 3;
++      else
++              chip_chainmask = 7;
++
+       pCap->tx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_TX_MASK);
+       /*
+        * For AR9271 we will temporarilly uses the rx chainmax as read from
+@@ -1990,6 +2074,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+               /* Use rx_chainmask from EEPROM. */
+               pCap->rx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_RX_MASK);
+ 
++      pCap->tx_chainmask = fixup_chainmask(chip_chainmask, pCap->tx_chainmask);
++      pCap->rx_chainmask = fixup_chainmask(chip_chainmask, pCap->rx_chainmask);
++
+       ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA;
+ 
+       /* enable key search for every frame in an aggregate */
+@@ -2079,10 +2166,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+                       pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;

        } else {
        } else {

+               pCap->tx_desc_len = sizeof(struct ath_desc);
+-              if (AR_SREV_9280_20(ah) &&
+-                  ((ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV) <=
+-                    AR5416_EEP_MINOR_VER_16) ||
+-                   ah->eep_ops->get_eeprom(ah, EEP_FSTCLK_5G)))
++              if (AR_SREV_9280_20(ah))
+                       pCap->hw_caps |= ATH9K_HW_CAP_FASTCLOCK;
+       }
+ 
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -983,8 +983,6 @@ void ath9k_hw_get_delta_slope_vals(struc
+ void ar9002_hw_cck_chan14_spread(struct ath_hw *ah);
+ int ar9002_hw_rf_claim(struct ath_hw *ah);
+ void ar9002_hw_enable_async_fifo(struct ath_hw *ah);
+-void ar9002_hw_update_async_fifo(struct ath_hw *ah);
+-void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah);
+ 
+ /*
+  * Code specific to AR9003, we stuff these here to avoid callbacks
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -814,16 +814,19 @@ static bool ath9k_rx_accept(struct ath_c
+                           struct ath_rx_status *rx_stats,
+                           bool *decrypt_error)
+ {
+-#define is_mc_or_valid_tkip_keyix ((is_mc ||                  \
+-              (rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID && \
+-              test_bit(rx_stats->rs_keyix, common->tkip_keymap))))
+-
++      bool is_mc, is_valid_tkip, strip_mic, mic_error = false;
+       struct ath_hw *ah = common->ah;
+       __le16 fc;
+       u8 rx_status_len = ah->caps.rx_status_len;
+ 
+       fc = hdr->frame_control;
+ 
++      is_mc = !!is_multicast_ether_addr(hdr->addr1);
++      is_valid_tkip = rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID &&
++              test_bit(rx_stats->rs_keyix, common->tkip_keymap);
++      strip_mic = is_valid_tkip && !(rx_stats->rs_status &
++              (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC));
++
+       if (!rx_stats->rs_datalen)
+               return false;
+         /*
+@@ -838,6 +841,11 @@ static bool ath9k_rx_accept(struct ath_c
+       if (rx_stats->rs_more)

                return true;
                return true;

---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *
- void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
- void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
- void ath9k_hw_abortpcurecv(struct ath_hw *ah);
--bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
-+bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset);
- int ath9k_hw_beaconq_setup(struct ath_hw *ah);
- 
- /* Interrupt Handling */
+ 
++      mic_error = is_valid_tkip && !ieee80211_is_ctl(fc) &&
++              !ieee80211_has_morefrags(fc) &&
++              !(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) &&
++              (rx_stats->rs_status & ATH9K_RXERR_MIC);
++
+       /*
+        * The rx_stats->rs_status will not be set until the end of the
+        * chained descriptors so it can be ignored if rs_more is set. The
+@@ -845,30 +853,18 @@ static bool ath9k_rx_accept(struct ath_c
+        * descriptors.
+        */
+       if (rx_stats->rs_status != 0) {
+-              if (rx_stats->rs_status & ATH9K_RXERR_CRC)
++              if (rx_stats->rs_status & ATH9K_RXERR_CRC) {
+                       rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
++                      mic_error = false;
++              }
+               if (rx_stats->rs_status & ATH9K_RXERR_PHY)
+                       return false;
+ 
+               if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
+                       *decrypt_error = true;
+-              } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
+-                      bool is_mc;
+-                      /*
+-                       * The MIC error bit is only valid if the frame
+-                       * is not a control frame or fragment, and it was
+-                       * decrypted using a valid TKIP key.
+-                       */
+-                      is_mc = !!is_multicast_ether_addr(hdr->addr1);
+-
+-                      if (!ieee80211_is_ctl(fc) &&
+-                          !ieee80211_has_morefrags(fc) &&
+-                          !(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) &&
+-                          is_mc_or_valid_tkip_keyix)
+-                              rxs->flag |= RX_FLAG_MMIC_ERROR;
+-                      else
+-                              rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
++                      mic_error = false;
+               }
++
+               /*
+                * Reject error frames with the exception of
+                * decryption and MIC failures. For monitor mode,
+@@ -886,6 +882,18 @@ static bool ath9k_rx_accept(struct ath_c
+                       }
+               }
+       }
++
++      /*
++       * For unicast frames the MIC error bit can have false positives,
++       * so all MIC error reports need to be validated in software.
++       * False negatives are not common, so skip software verification
++       * if the hardware considers the MIC valid.
++       */
++      if (strip_mic)
++              rxs->flag |= RX_FLAG_MMIC_STRIPPED;
++      else if (is_mc && mic_error)
++              rxs->flag |= RX_FLAG_MMIC_ERROR;
++
+       return true;
+ }
+ 
+@@ -1938,6 +1946,9 @@ int ath_rx_tasklet(struct ath_softc *sc,
+                       sc->rx.rxotherant = 0;
+               }
+ 
++              if (rxs->flag & RX_FLAG_MMIC_STRIPPED)
++                      skb_trim(skb, skb->len - 8);
++
+               spin_lock_irqsave(&sc->sc_pm_lock, flags);
+ 
+               if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
+--- a/drivers/net/wireless/ath/ath9k/reg.h
++++ b/drivers/net/wireless/ath/ath9k/reg.h
+@@ -600,7 +600,6 @@
+ 
+ #define AR_D_GBL_IFS_SIFS         0x1030
+ #define AR_D_GBL_IFS_SIFS_M       0x0000FFFF
+-#define AR_D_GBL_IFS_SIFS_ASYNC_FIFO_DUR 0x000003AB
+ #define AR_D_GBL_IFS_SIFS_RESV0   0xFFFFFFFF
+ 
+ #define AR_D_TXBLK_BASE            0x1038
+@@ -616,12 +615,10 @@
+ #define AR_D_GBL_IFS_SLOT         0x1070
+ #define AR_D_GBL_IFS_SLOT_M       0x0000FFFF
+ #define AR_D_GBL_IFS_SLOT_RESV0   0xFFFF0000
+-#define AR_D_GBL_IFS_SLOT_ASYNC_FIFO_DUR   0x00000420
+ 
+ #define AR_D_GBL_IFS_EIFS         0x10b0
+ #define AR_D_GBL_IFS_EIFS_M       0x0000FFFF
+ #define AR_D_GBL_IFS_EIFS_RESV0   0xFFFF0000
+-#define AR_D_GBL_IFS_EIFS_ASYNC_FIFO_DUR   0x0000A5EB
+ 
+ #define AR_D_GBL_IFS_MISC        0x10f0
+ #define AR_D_GBL_IFS_MISC_LFSR_SLICE_SEL        0x00000007
+@@ -1477,7 +1474,6 @@ enum {
+ #define AR_TIME_OUT_ACK_S    0
+ #define AR_TIME_OUT_CTS      0x3FFF0000
+ #define AR_TIME_OUT_CTS_S    16
+-#define AR_TIME_OUT_ACK_CTS_ASYNC_FIFO_DUR    0x16001D56
+ 
+ #define AR_RSSI_THR          0x8018
+ #define AR_RSSI_THR_MASK     0x000000FF
+@@ -1493,7 +1489,6 @@ enum {
+ #define AR_USEC_TX_LAT_S     14
+ #define AR_USEC_RX_LAT       0x1F800000
+ #define AR_USEC_RX_LAT_S     23
+-#define AR_USEC_ASYNC_FIFO_DUR    0x12e00074
+ 
+ #define AR_RESET_TSF        0x8020
+ #define AR_RESET_TSF_ONCE   0x01000000