bcm63xx: add initial support for bcm6368 boards

[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 371e82b..30ce96e 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,288 +1,283 @@
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -1122,6 +1122,7 @@ struct cfg80211_ibss_params {
-       u8 *ssid;
-       u8 *bssid;
-       struct ieee80211_channel *channel;
-+      enum nl80211_channel_type channel_type;
-       u8 *ie;
-       u8 ssid_len, ie_len;
-       u16 beacon_interval;
-@@ -3188,6 +3189,16 @@ void cfg80211_gtk_rekey_notify(struct ne
- void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
-                                    const u8 *bssid, bool preauth, gfp_t gfp);
- 
-+/**
-+ * cfg80211_can_use_ext_chan - test if ht40 on extension channel can be used
-+ * @wiphy: the wiphy
-+ * @chan: main channel
-+ * @channel_type: HT mode
-+ */
-+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
-+                                struct ieee80211_channel *chan,
-+                                enum nl80211_channel_type channel_type);
-+
- /* Logging, debugging and troubleshooting/diagnostic helpers. */
- 
- /* wiphy_printk helpers, similar to dev_printk */
+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+@@ -326,7 +326,6 @@ static bool ar9003_hw_get_isr(struct ath
+ 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;
+ 
+@@ -336,11 +335,7 @@ static int ar9003_hw_proc_txdesc(struct 
+       if ((status & AR_TxDone) == 0)
+               return -EINPROGRESS;
+ 
+-      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;
++      ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
+ 
+       if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
+           (MS(ads->ds_info, AR_TxRxDesc) != 1)) {
+@@ -354,6 +349,7 @@ 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;
+@@ -440,20 +436,14 @@ int ath9k_hw_process_rxdesc_edma(struct 
+       struct ar9003_rxs *rxsp = (struct ar9003_rxs *) buf_addr;
+       unsigned int phyerr;
+ 
+-      /* TODO: byte swap on big endian for ar9300_10 */
+-
+-      if (!rxs) {
+-              if ((rxsp->status11 & AR_RxDone) == 0)
+-                      return -EINPROGRESS;
+-
+-              if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
+-                      return -EINVAL;
++      if ((rxsp->status11 & AR_RxDone) == 0)
++              return -EINPROGRESS;
+ 
+-              if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
+-                      return -EINPROGRESS;
++      if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
++              return -EINVAL;
+ 
+-              return 0;
+-      }
++      if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
++              return -EINPROGRESS;
+ 
+       rxs->rs_status = 0;
+       rxs->rs_flags =  0;
+@@ -510,7 +500,11 @@ int ath9k_hw_process_rxdesc_edma(struct 
+                */
+               if (rxsp->status11 & AR_CRCErr)
+                       rxs->rs_status |= ATH9K_RXERR_CRC;
+-              else if (rxsp->status11 & AR_PHYErr) {
++              else if (rxsp->status11 & AR_DecryptCRCErr)
++                      rxs->rs_status |= ATH9K_RXERR_DECRYPT;
++              else if (rxsp->status11 & AR_MichaelErr)
++                      rxs->rs_status |= ATH9K_RXERR_MIC;
++              if (rxsp->status11 & AR_PHYErr) {
+                       phyerr = MS(rxsp->status11, AR_PHYErrCode);
+                       /*
+                        * If we reach a point here where AR_PostDelimCRCErr is
+@@ -532,11 +526,7 @@ int ath9k_hw_process_rxdesc_edma(struct 
+                               rxs->rs_status |= ATH9K_RXERR_PHY;
+                               rxs->rs_phyerr = phyerr;
+                       }
+-
+-              } else if (rxsp->status11 & AR_DecryptCRCErr)
+-                      rxs->rs_status |= ATH9K_RXERR_DECRYPT;
+-              else if (rxsp->status11 & AR_MichaelErr)
+-                      rxs->rs_status |= ATH9K_RXERR_MIC;
++              };
+       }
+ 
+       if (rxsp->status11 & AR_KeyMiss)
+--- a/drivers/net/wireless/ath/carl9170/tx.c
++++ b/drivers/net/wireless/ath/carl9170/tx.c
+@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct a
+ {
+       struct ieee80211_sta *sta;
+       struct carl9170_sta_info *sta_info;
++      struct ieee80211_tx_info *tx_info;
+ 
+       rcu_read_lock();
+       sta = __carl9170_get_tx_sta(ar, skb);
+@@ -1243,12 +1244,13 @@ static bool carl9170_tx_ps_drop(struct a
+               goto out_rcu;
+ 
+       sta_info = (void *) sta->drv_priv;
+-      if (unlikely(sta_info->sleeping)) {
+-              struct ieee80211_tx_info *tx_info;
++      tx_info = IEEE80211_SKB_CB(skb);
+ 
++      if (unlikely(sta_info->sleeping) &&
++          !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
++                              IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
+               rcu_read_unlock();
+ 
+-              tx_info = IEEE80211_SKB_CB(skb);
+               if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
+                       atomic_dec(&ar->tx_ampdu_upload);
+ 
+--- a/drivers/net/wireless/iwlegacy/4965-mac.c
++++ b/drivers/net/wireless/iwlegacy/4965-mac.c
+@@ -1694,7 +1694,7 @@ il4965_tx_skb(struct il_priv *il, struct
+               sta_priv = (void *)sta->drv_priv;
+ 
+       if (sta_priv && sta_priv->asleep &&
+-          (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
++          (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
+               /*
+                * This sends an asynchronous command to the device,
+                * but we can rely on it being processed before the
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
+               sta_priv = (void *)info->control.sta->drv_priv;
+ 
+       if (sta_priv && sta_priv->asleep &&
+-          (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
++          (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
+               /*
+                * This sends an asynchronous command to the device,
+                * but we can rely on it being processed before the
+@@ -331,6 +331,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
+                * counter.
+                * For now set the counter to just 1 since we do not
+                * support uAPSD yet.
++               *
++               * FIXME: If we get two non-bufferable frames one
++               * after the other, we might only send out one of
++               * them because this is racy.
+                */
+               iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
+       }
+--- a/drivers/net/wireless/p54/txrx.c
++++ b/drivers/net/wireless/p54/txrx.c
+@@ -690,7 +690,7 @@ static void p54_tx_80211_header(struct p
+       if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
+               *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
+ 
+-      if (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)
++      if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
+               *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
+ 
+       if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -341,9 +341,9 @@ struct ieee80211_bss_conf {
+  *    used to indicate that a frame was already retried due to PS
+  * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
+  *    used to indicate frame should not be encrypted
+- * @IEEE80211_TX_CTL_POLL_RESPONSE: This frame is a response to a poll
+- *    frame (PS-Poll or uAPSD) and should be sent although the station
+- *    is in powersave mode.
++ * @IEEE80211_TX_CTL_NO_PS_BUFFER: This frame is a response to a poll
++ *    frame (PS-Poll or uAPSD) or a non-bufferable MMPDU and must
++ *    be sent although the station is in powersave mode.
+  * @IEEE80211_TX_CTL_MORE_FRAMES: More frames will be passed to the
+  *    transmit function after the current frame, this can be used
+  *    by drivers to kick the DMA queue only if unset or when the
+@@ -399,7 +399,7 @@ enum mac80211_tx_control_flags {
+       IEEE80211_TX_INTFL_NEED_TXPROCESSING    = BIT(14),
+       IEEE80211_TX_INTFL_RETRIED              = BIT(15),
+       IEEE80211_TX_INTFL_DONT_ENCRYPT         = BIT(16),
+-      IEEE80211_TX_CTL_POLL_RESPONSE          = BIT(17),
++      IEEE80211_TX_CTL_NO_PS_BUFFER           = BIT(17),
+       IEEE80211_TX_CTL_MORE_FRAMES            = BIT(18),
+       IEEE80211_TX_INTFL_RETRANSMISSION       = BIT(19),
+       /* hole at 20, use later */
+@@ -425,7 +425,7 @@ enum mac80211_tx_control_flags {
+       IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU |           \
+       IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK |               \
+       IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK |           \
+-      IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_POLL_RESPONSE |   \
++      IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_NO_PS_BUFFER |    \
+       IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC |                \
+       IEEE80211_TX_CTL_STBC | IEEE80211_TX_STATUS_EOSP)
+ 
+@@ -659,6 +659,8 @@ ieee80211_tx_info_clear_status(struct ie
+  * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
+  * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
+  * @RX_FLAG_SHORT_GI: Short guard interval was used
++ * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present.
++ *    Valid only for data frames (mainly A-MPDU)
+  */
+ enum mac80211_rx_flags {
+       RX_FLAG_MMIC_ERROR      = 1<<0,
+@@ -672,6 +674,7 @@ enum mac80211_rx_flags {
+       RX_FLAG_HT              = 1<<9,
+       RX_FLAG_40MHZ           = 1<<10,
+       RX_FLAG_SHORT_GI        = 1<<11,
++      RX_FLAG_NO_SIGNAL_VAL   = 1<<12,
+ };
+ 
+ /**
+@@ -1634,7 +1637,7 @@ void ieee80211_free_txskb(struct ieee802
+  * the station sends a PS-Poll or a uAPSD trigger frame, mac80211
+  * will inform the driver of this with the @allow_buffered_frames
+  * callback; this callback is optional. mac80211 will then transmit
+- * the frames as usual and set the %IEEE80211_TX_CTL_POLL_RESPONSE
++ * the frames as usual and set the %IEEE80211_TX_CTL_NO_PS_BUFFER
+  * on each frame. The last frame in the service period (or the only
+  * response to a PS-Poll) also has %IEEE80211_TX_STATUS_EOSP set to
+  * indicate that it ends the service period; as this frame must have
+@@ -1642,6 +1645,9 @@ void ieee80211_free_txskb(struct ieee802
+  * When TX status is reported for this frame, the service period is
+  * marked has having ended and a new one can be started by the peer.
+  *
++ * Additionally, non-bufferable MMPDUs can also be transmitted by
++ * mac80211 with the %IEEE80211_TX_CTL_NO_PS_BUFFER set in them.
++ *
+  * Another race condition can happen on some devices like iwlwifi
+  * when there are frames queued for the station and it wakes up
+  * or polls; the frames that are already queued could end up being
+@@ -2140,7 +2146,7 @@ enum ieee80211_frame_release_type {
+  * @allow_buffered_frames: Prepare device to allow the given number of frames
+  *    to go out to the given station. The frames will be sent by mac80211
+  *    via the usual TX path after this call. The TX information for frames
+- *    released will also have the %IEEE80211_TX_CTL_POLL_RESPONSE flag set
++ *    released will also have the %IEEE80211_TX_CTL_NO_PS_BUFFER flag set
+  *    and the last one will also have %IEEE80211_TX_STATUS_EOSP set. In case
+  *    frames from multiple TIDs are released and the driver might reorder
+  *    them between the TIDs, it must set the %IEEE80211_TX_STATUS_EOSP flag

 --- a/net/mac80211/agg-rx.c
 +++ b/net/mac80211/agg-rx.c
 --- a/net/mac80211/agg-rx.c
 +++ b/net/mac80211/agg-rx.c

-@@ -180,6 +180,10 @@ static void ieee80211_send_addba_resp(st
-               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+@@ -187,6 +187,8 @@ static void ieee80211_send_addba_resp(st

                memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
                memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);

+       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
+               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);

 +      else if (sdata->vif.type == NL80211_IFTYPE_WDS)
 +              memcpy(mgmt->bssid, da, ETH_ALEN);
 +      else if (sdata->vif.type == NL80211_IFTYPE_WDS)
 +              memcpy(mgmt->bssid, da, ETH_ALEN);

-+      else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-+              memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);

  
        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                          IEEE80211_STYPE_ACTION);
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c
  
        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                          IEEE80211_STYPE_ACTION);
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c

-@@ -77,10 +77,13 @@ static void ieee80211_send_addba_request
-       memcpy(mgmt->da, da, ETH_ALEN);
+@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request

        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
        if (sdata->vif.type == NL80211_IFTYPE_AP ||
        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_AP_VLAN ||
+-          sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
++          sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||

 +          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);
 +          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);

-+      else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-+              memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
- 
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_ACTION);
-@@ -397,7 +400,9 @@ int ieee80211_start_tx_ba_session(struct
-        */
-       if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -471,6 +472,7 @@ int ieee80211_start_tx_ba_session(struct
+           sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&

            sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
            sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

--          sdata->vif.type != NL80211_IFTYPE_AP)
-+          sdata->vif.type != NL80211_IFTYPE_AP &&
-+          sdata->vif.type != NL80211_IFTYPE_ADHOC &&
-+          sdata->vif.type != NL80211_IFTYPE_WDS)
+           sdata->vif.type != NL80211_IFTYPE_AP &&
++          sdata->vif.type != NL80211_IFTYPE_WDS &&
+           sdata->vif.type != NL80211_IFTYPE_ADHOC)

                return -EINVAL;
  
                return -EINVAL;
  

-       if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

 --- a/net/mac80211/debugfs_sta.c
 +++ b/net/mac80211/debugfs_sta.c
 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
        test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  
        int res = scnprintf(buf, sizeof(buf),
 --- a/net/mac80211/debugfs_sta.c
 +++ b/net/mac80211/debugfs_sta.c
 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
        test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  
        int res = scnprintf(buf, sizeof(buf),

--                          "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-+                          "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+-                          "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++                          "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",

                            TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
                            TEST(PS_DRIVER), TEST(AUTHORIZED),
                            TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
                            TEST(PS_DRIVER), TEST(AUTHORIZED),

-                           TEST(SHORT_PREAMBLE), TEST(ASSOC_AP),
+                           TEST(SHORT_PREAMBLE),

 -                          TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
 +                          TEST(WME), TEST(CLEAR_PS_FILT),
                            TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
                            TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
 -                          TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
 +                          TEST(WME), TEST(CLEAR_PS_FILT),
                            TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
                            TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),

-                           TEST(TDLS_PEER_AUTH));
---- a/net/mac80211/ht.c
-+++ b/net/mac80211/ht.c
-@@ -199,6 +199,8 @@ void ieee80211_send_delba(struct ieee802
-               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_ADHOC)
-+              memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
- 
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_ACTION);
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -77,6 +77,7 @@ static void __ieee80211_sta_join_ibss(st
-       struct cfg80211_bss *bss;
-       u32 bss_change;
-       u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
-+      enum nl80211_channel_type channel_type;
- 
-       lockdep_assert_held(&ifibss->mtx);
- 
-@@ -104,8 +105,16 @@ static void __ieee80211_sta_join_ibss(st
- 
-       sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
- 
--      local->oper_channel = chan;
--      WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
-+      channel_type = ifibss->channel_type;
-+      if (channel_type > NL80211_CHAN_HT20 &&
-+          !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
-+              channel_type = NL80211_CHAN_HT20;
-+      if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
-+              /* can only fail due to HT40+/- mismatch */
-+              channel_type = NL80211_CHAN_HT20;
-+              WARN_ON(!ieee80211_set_channel_type(local, sdata,
-+                                                  NL80211_CHAN_HT20));
-+      }
-       ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
- 
-       sband = local->hw.wiphy->bands[chan->band];
-@@ -171,6 +180,18 @@ static void __ieee80211_sta_join_ibss(st
-               memcpy(skb_put(skb, ifibss->ie_len),
-                      ifibss->ie, ifibss->ie_len);
- 
-+      /* add HT capability and information IEs */
-+      if (channel_type && sband->ht_cap.ht_supported) {
-+              pos = skb_put(skb, 4 +
-+                                 sizeof(struct ieee80211_ht_cap) +
-+                                 sizeof(struct ieee80211_ht_info));
-+              pos = ieee80211_ie_build_ht_cap(pos, sband, sband->ht_cap.cap);
-+              pos = ieee80211_ie_build_ht_info(pos,
-+                                               &sband->ht_cap,
-+                                               chan,
-+                                               channel_type);
-+      }
-+
-       if (local->hw.queues >= 4) {
-               pos = skb_put(skb, 9);
-               *pos++ = WLAN_EID_VENDOR_SPECIFIC;
-@@ -194,6 +215,7 @@ static void __ieee80211_sta_join_ibss(st
-       bss_change |= BSS_CHANGED_BEACON;
-       bss_change |= BSS_CHANGED_BEACON_ENABLED;
-       bss_change |= BSS_CHANGED_BASIC_RATES;
-+      bss_change |= BSS_CHANGED_HT;
-       bss_change |= BSS_CHANGED_IBSS;
-       sdata->vif.bss_conf.ibss_joined = true;
-       ieee80211_bss_info_change_notify(sdata, bss_change);
-@@ -266,6 +288,7 @@ static void ieee80211_rx_bss_info(struct
-       u64 beacon_timestamp, rx_timestamp;
-       u32 supp_rates = 0;
-       enum ieee80211_band band = rx_status->band;
-+      struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
- 
-       if (elems->ds_params && elems->ds_params_len == 1)
-               freq = ieee80211_channel_to_frequency(elems->ds_params[0],
-@@ -275,7 +298,10 @@ static void ieee80211_rx_bss_info(struct
- 
-       channel = ieee80211_get_channel(local->hw.wiphy, freq);
- 
--      if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
-+      if (!channel ||
-+          channel->flags & (IEEE80211_CHAN_DISABLED ||
-+                            IEEE80211_CHAN_NO_IBSS ||
-+                            IEEE80211_CHAN_RADAR))
-               return;
- 
-       if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
-@@ -313,8 +339,41 @@ static void ieee80211_rx_bss_info(struct
-                                               GFP_ATOMIC);
-               }
- 
--              if (sta && elems->wmm_info)
--                      set_sta_flag(sta, WLAN_STA_WME);
-+              if (sta) {
-+                      if (elems->wmm_info)
-+                              set_sta_flag(sta, WLAN_STA_WME);
-+
-+                      /* we both use HT */
-+                      if (elems->ht_info_elem && elems->ht_cap_elem &&
-+                          sdata->u.ibss.channel_type) {
-+                              enum nl80211_channel_type channel_type =
-+                                      ieee80211_ht_info_to_channel_type(
-+                                                         elems->ht_info_elem);
-+                              struct ieee80211_sta_ht_cap sta_ht_cap_new;
-+
-+                              /*
-+                               * fall back to HT20 if we don't use or use
-+                               * the other extension channel
-+                               */
-+                              if (channel_type > NL80211_CHAN_HT20 &&
-+                                  channel_type != sdata->u.ibss.channel_type)
-+                                      channel_type = NL80211_CHAN_HT20;
-+
-+                              ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
-+                                              elems->ht_cap_elem,
-+                                              &sta_ht_cap_new);
-+                              if (memcmp(&sta->sta.ht_cap, &sta_ht_cap_new,
-+                                         sizeof(sta_ht_cap_new))) {
-+                                      memcpy(&sta->sta.ht_cap,
-+                                             &sta_ht_cap_new,
-+                                             sizeof(sta_ht_cap_new));
-+                                      rate_control_rate_update(local, sband,
-+                                                      sta,
-+                                                      IEEE80211_RC_HT_CHANGED,
-+                                                      channel_type);
-+                              }
-+                      }
-+              }
- 
-               rcu_read_unlock();
-       }
-@@ -896,10 +955,15 @@ int ieee80211_ibss_join(struct ieee80211
-       struct sk_buff *skb;
- 
-       skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom +
--                          36 /* bitrates */ +
--                          34 /* SSID */ +
--                          3  /* DS params */ +
--                          4  /* IBSS params */ +
-+                          sizeof(struct ieee80211_hdr_3addr) +
-+                          12 /* struct ieee80211_mgmt.u.beacon */ +
-+                          2 + IEEE80211_MAX_SSID_LEN /* max SSID */ +
-+                          2 + 8 /* max Supported Rates */ +
-+                          3 /* max DS params */ +
-+                          4 /* IBSS params */ +
-+                          2 + (IEEE80211_MAX_SUPP_RATES - 8) +
-+                          2 + sizeof(struct ieee80211_ht_cap) +
-+                          2 + sizeof(struct ieee80211_ht_info) +
-                           params->ie_len);
-       if (!skb)
-               return -ENOMEM;
-@@ -920,13 +984,15 @@ int ieee80211_ibss_join(struct ieee80211
-       sdata->vif.bss_conf.beacon_int = params->beacon_interval;
- 
-       sdata->u.ibss.channel = params->channel;
-+      sdata->u.ibss.channel_type = params->channel_type;
-       sdata->u.ibss.fixed_channel = params->channel_fixed;
- 
-       /* fix ourselves to that channel now already */
-       if (params->channel_fixed) {
-               sdata->local->oper_channel = params->channel;
--              WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
--                                                  NL80211_CHAN_NO_HT));
-+              if (!ieee80211_set_channel_type(sdata->local, sdata,
-+                                             params->channel_type))
-+                      return -EINVAL;
-       }
- 
-       if (params->ie) {
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -465,6 +465,7 @@ struct ieee80211_if_ibss {
-       u8 ssid_len, ie_len;
-       u8 *ie;
-       struct ieee80211_channel *channel;
-+      enum nl80211_channel_type channel_type;
- 
-       unsigned long ibss_join_req;
-       /* probe response/beacon for IBSS */
-@@ -1339,6 +1340,12 @@ void ieee80211_recalc_smps(struct ieee80
- size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
-                         const u8 *ids, int n_ids, size_t offset);
- size_t ieee80211_ie_split_vendor(const u8 *ies, size_t ielen, size_t offset);
-+u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_supported_band *sband,
-+                            u16 cap);
-+u8 *ieee80211_ie_build_ht_info(u8 *pos,
-+                              struct ieee80211_sta_ht_cap *ht_cap,
-+                              struct ieee80211_channel *channel,
-+                              enum nl80211_channel_type channel_type);
- 
- /* internal work items */
- void ieee80211_work_init(struct ieee80211_local *local);
-@@ -1367,6 +1374,8 @@ ieee80211_get_channel_mode(struct ieee80
- bool ieee80211_set_channel_type(struct ieee80211_local *local,
-                               struct ieee80211_sub_if_data *sdata,
-                               enum nl80211_channel_type chantype);
-+enum nl80211_channel_type
-+ieee80211_ht_info_to_channel_type(struct ieee80211_ht_info *ht_info);
- 
- #ifdef CONFIG_MAC80211_NOINLINE
- #define debug_noinline noinline
+                           TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),

 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_


@@ -293,7 +288,7 @@
        u32 changed = 0;
        int res;
        u32 hw_reconf_flags = 0;
        u32 changed = 0;
        int res;
        u32 hw_reconf_flags = 0;

-@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+@@ -309,28 +308,6 @@ static int ieee80211_do_open(struct net_

  
        set_bit(SDATA_STATE_RUNNING, &sdata->state);
  
  
        set_bit(SDATA_STATE_RUNNING, &sdata->state);
  


@@ -306,8 +301,9 @@
 -                      goto err_del_interface;
 -              }
 -
 -                      goto err_del_interface;
 -              }
 -

--              /* no atomic bitop required since STA is not live yet */
--              set_sta_flag(sta, WLAN_STA_AUTHORIZED);
+-              sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+-              sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+-              sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);

 -
 -              res = sta_info_insert(sta);
 -              if (res) {
 -
 -              res = sta_info_insert(sta);
 -              if (res) {


@@ -321,17 +317,17 @@
        /*
         * set_multicast_list will be invoked by the networking core
         * which will check whether any increments here were done in
        /*
         * 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_
+@@ -357,8 +334,7 @@ static int ieee80211_do_open(struct net_

        netif_tx_start_all_queues(dev);
  
        return 0;
 - err_del_interface:
        netif_tx_start_all_queues(dev);
  
        return 0;
 - err_del_interface:

--      drv_remove_interface(local, &sdata->vif);
+-      drv_remove_interface(local, sdata);

 +
   err_stop:
        if (!local->open_count)
                drv_stop(local);
 +
   err_stop:
        if (!local->open_count)
                drv_stop(local);

-@@ -716,6 +693,70 @@ static void ieee80211_if_setup(struct ne
+@@ -722,6 +698,70 @@ static void ieee80211_if_setup(struct ne

        dev->destructor = free_netdev;
  }
  
        dev->destructor = free_netdev;
  }
  


@@ -384,7 +380,7 @@
 +      sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 +
 +      if (elems.ht_cap_elem)
 +      sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 +
 +      if (elems.ht_cap_elem)

-+              ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++              ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,

 +                              elems.ht_cap_elem, &sta->sta.ht_cap);
 +
 +      if (elems.wmm_param)
 +                              elems.ht_cap_elem, &sta->sta.ht_cap);
 +
 +      if (elems.wmm_param)


@@ -402,7 +398,7 @@
  static void ieee80211_iface_work(struct work_struct *work)
  {
        struct ieee80211_sub_if_data *sdata =
  static void ieee80211_iface_work(struct work_struct *work)
  {
        struct ieee80211_sub_if_data *sdata =

-@@ -820,6 +861,9 @@ static void ieee80211_iface_work(struct 
+@@ -826,6 +866,9 @@ static void ieee80211_iface_work(struct 

                                break;
                        ieee80211_mesh_rx_queued_mgmt(sdata, skb);
                        break;
                                break;
                        ieee80211_mesh_rx_queued_mgmt(sdata, skb);
                        break;


@@ -414,18 +410,62 @@
                        break;
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
                        break;
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c

-@@ -2211,7 +2211,9 @@ ieee80211_rx_h_action(struct ieee80211_r
-                */
-               if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -177,7 +177,8 @@ ieee80211_add_rx_radiotap_header(struct 
+       pos += 2;
+ 
+       /* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */
+-      if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
++      if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM &&
++          !(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
+               *pos = status->signal;
+               rthdr->it_present |=
+                       cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
+@@ -489,12 +490,12 @@ ieee80211_rx_mesh_check(struct ieee80211
+                       if (ieee80211_has_tods(hdr->frame_control) ||
+                               !ieee80211_has_fromds(hdr->frame_control))
+                               return RX_DROP_MONITOR;
+-                      if (memcmp(hdr->addr3, dev_addr, ETH_ALEN) == 0)
++                      if (compare_ether_addr(hdr->addr3, dev_addr) == 0)
+                               return RX_DROP_MONITOR;
+               } else {
+                       if (!ieee80211_has_a4(hdr->frame_control))
+                               return RX_DROP_MONITOR;
+-                      if (memcmp(hdr->addr4, dev_addr, ETH_ALEN) == 0)
++                      if (compare_ether_addr(hdr->addr4, dev_addr) == 0)
+                               return RX_DROP_MONITOR;
+               }
+       }
+@@ -1309,8 +1310,10 @@ ieee80211_rx_h_sta_process(struct ieee80
+ 
+       sta->rx_fragments++;
+       sta->rx_bytes += rx->skb->len;
+-      sta->last_signal = status->signal;
+-      ewma_add(&sta->avg_signal, -status->signal);
++      if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
++              sta->last_signal = status->signal;
++              ewma_add(&sta->avg_signal, -status->signal);
++      }
+ 
+       /*
+        * Change STA power saving mode only at the end of a frame
+@@ -2282,6 +2285,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+                   sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&

                    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
                    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

--                  sdata->vif.type != NL80211_IFTYPE_AP)
-+                  sdata->vif.type != NL80211_IFTYPE_AP &&
-+                  sdata->vif.type != NL80211_IFTYPE_ADHOC &&
-+                  sdata->vif.type != NL80211_IFTYPE_WDS)
+                   sdata->vif.type != NL80211_IFTYPE_AP &&
++                  sdata->vif.type != NL80211_IFTYPE_WDS &&
+                   sdata->vif.type != NL80211_IFTYPE_ADHOC)

                        break;
  
                        break;
  

-               /* verify action_code is present */
-@@ -2426,13 +2428,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2336,7 +2340,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+                       if (sdata->vif.type != NL80211_IFTYPE_STATION)
+                               break;
+ 
+-                      if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
++                      if (compare_ether_addr(mgmt->bssid, sdata->u.mgd.bssid))
+                               break;
+ 
+                       goto queue;
+@@ -2492,14 +2496,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_

  
        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
            sdata->vif.type != NL80211_IFTYPE_ADHOC &&
  
        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
            sdata->vif.type != NL80211_IFTYPE_ADHOC &&


@@ -435,14 +475,15 @@
                return RX_DROP_MONITOR;
  
        switch (stype) {
                return RX_DROP_MONITOR;
  
        switch (stype) {

+       case cpu_to_le16(IEEE80211_STYPE_AUTH):

        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_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):
-@@ -2775,10 +2778,16 @@ static int prepare_for_handlers(struct i
+       case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+       case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+@@ -2853,10 +2858,16 @@ static int prepare_for_handlers(struct i

                }
                break;
        case NL80211_IFTYPE_WDS:
                }
                break;
        case NL80211_IFTYPE_WDS:


@@ -461,269 +502,1447 @@
                break;
        default:
                /* should never get here */
                break;
        default:
                /* should never get here */

+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -9,6 +9,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/etherdevice.h>
+ #include <linux/netdevice.h>
+ #include <linux/types.h>
+ #include <linux/slab.h>
+@@ -101,7 +102,7 @@ struct sta_info *sta_info_get(struct iee
+                                   lockdep_is_held(&local->sta_mtx));
+       while (sta) {
+               if (sta->sdata == sdata &&
+-                  memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
++                  compare_ether_addr(sta->sta.addr, addr) == 0)
+                       break;
+               sta = rcu_dereference_check(sta->hnext,
+                                           lockdep_is_held(&local->sta_mtx));
+@@ -124,7 +125,7 @@ struct sta_info *sta_info_get_bss(struct
+       while (sta) {
+               if ((sta->sdata == sdata ||
+                    (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
+-                  memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
++                  compare_ether_addr(sta->sta.addr, addr) == 0)
+                       break;
+               sta = rcu_dereference_check(sta->hnext,
+                                           lockdep_is_held(&local->sta_mtx));
+@@ -1050,7 +1051,7 @@ static void ieee80211_send_null_response
+        * exchange. Also set EOSP to indicate this packet
+        * ends the poll/service period.
+        */
+-      info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE |
++      info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
+                      IEEE80211_TX_STATUS_EOSP |
+                      IEEE80211_TX_CTL_REQ_TX_STATUS;
+ 
+@@ -1177,7 +1178,7 @@ ieee80211_sta_ps_deliver_response(struct
+                        * STA may still remain is PS mode after this frame
+                        * exchange.
+                        */
+-                      info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE;
++                      info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+ 
+                       /*
+                        * Use MoreData flag to indicate whether there are

 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h

-@@ -32,7 +32,6 @@
+@@ -14,6 +14,7 @@
+ #include <linux/if_ether.h>
+ #include <linux/workqueue.h>
+ #include <linux/average.h>
++#include <linux/etherdevice.h>
+ #include "key.h"
+ 
+ /**
+@@ -31,7 +32,6 @@
+  * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble

   *    frames.
   *    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.
   * @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.

-@@ -61,7 +60,6 @@ enum ieee80211_sta_info_flags {
+@@ -62,7 +62,6 @@ enum ieee80211_sta_info_flags {
+       WLAN_STA_AUTHORIZED,

        WLAN_STA_SHORT_PREAMBLE,
        WLAN_STA_SHORT_PREAMBLE,

-       WLAN_STA_ASSOC_AP,

        WLAN_STA_WME,
 -      WLAN_STA_WDS,
        WLAN_STA_CLEAR_PS_FILT,
        WLAN_STA_MFP,
        WLAN_STA_BLOCK_BA,
        WLAN_STA_WME,
 -      WLAN_STA_WDS,
        WLAN_STA_CLEAR_PS_FILT,
        WLAN_STA_MFP,
        WLAN_STA_BLOCK_BA,

---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -836,23 +836,8 @@ int ieee80211_build_preq_ies(struct ieee
-               offset = noffset;
+@@ -489,7 +488,7 @@ void for_each_sta_info_type_check(struct
+               nxt = _sta ? rcu_dereference(_sta->hnext) : NULL        \
+            )                                                          \
+       /* compare address and run code only if it matches */           \
+-      if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0)
++      if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0)
+ 
+ /*
+  * Get STA info by index, BROKEN!
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -448,18 +448,23 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
+       struct ieee80211_local *local = tx->local;
+ 
+-      if (unlikely(!sta ||
+-                   ieee80211_is_probe_resp(hdr->frame_control) ||
+-                   ieee80211_is_auth(hdr->frame_control) ||
+-                   ieee80211_is_assoc_resp(hdr->frame_control) ||
+-                   ieee80211_is_reassoc_resp(hdr->frame_control)))
++      if (unlikely(!sta))
+               return TX_CONTINUE;
+ 
+       if (unlikely((test_sta_flag(sta, WLAN_STA_PS_STA) ||
+                     test_sta_flag(sta, WLAN_STA_PS_DRIVER)) &&
+-                   !(info->flags & IEEE80211_TX_CTL_POLL_RESPONSE))) {
++                   !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
+               int ac = skb_get_queue_mapping(tx->skb);
+ 
++              /* only deauth, disassoc and action are bufferable MMPDUs */
++              if (ieee80211_is_mgmt(hdr->frame_control) &&
++                  !ieee80211_is_deauth(hdr->frame_control) &&
++                  !ieee80211_is_disassoc(hdr->frame_control) &&
++                  !ieee80211_is_action(hdr->frame_control)) {
++                      info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
++                      return TX_CONTINUE;
++              }
++
+ #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+               printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
+                      sta->sta.addr, sta->sta.aid, ac);
+@@ -1060,6 +1065,7 @@ static bool ieee80211_tx_prep_agg(struct
+ {
+       bool queued = false;
+       bool reset_agg_timer = false;
++      struct sk_buff *purge_skb = NULL;
+ 
+       if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
+               info->flags |= IEEE80211_TX_CTL_AMPDU;
+@@ -1101,8 +1107,13 @@ static bool ieee80211_tx_prep_agg(struct
+                       info->control.vif = &tx->sdata->vif;
+                       info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
+                       __skb_queue_tail(&tid_tx->pending, skb);
++                      if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER)
++                              purge_skb = __skb_dequeue(&tid_tx->pending);
+               }
+               spin_unlock(&tx->sta->lock);
++
++              if (purge_skb)
++                      dev_kfree_skb(purge_skb);

        }
  
        }
  

--      if (sband->ht_cap.ht_supported) {
--              u16 cap = sband->ht_cap.cap;
--              __le16 tmp;
--
--              *pos++ = WLAN_EID_HT_CAPABILITY;
--              *pos++ = sizeof(struct ieee80211_ht_cap);
--              memset(pos, 0, sizeof(struct ieee80211_ht_cap));
--              tmp = cpu_to_le16(cap);
--              memcpy(pos, &tmp, sizeof(u16));
--              pos += sizeof(u16);
--              *pos++ = sband->ht_cap.ampdu_factor |
--                       (sband->ht_cap.ampdu_density <<
--                              IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
--              memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
--              pos += sizeof(sband->ht_cap.mcs);
--              pos += 2 + 4 + 1; /* ext info, BF cap, antsel */
--      }
-+      if (sband->ht_cap.ht_supported)
-+              pos = ieee80211_ie_build_ht_cap(pos, sband, sband->ht_cap.cap);
+       /* reset session timer */
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -480,7 +480,7 @@ struct ieee80211_if_ibss {
+ 
+       bool control_port;
+ 
+-      u8 bssid[ETH_ALEN];
++      u8 bssid[ETH_ALEN] __aligned(2);
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
+       u8 ssid_len, ie_len;
+       u8 *ie;
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -66,7 +66,7 @@ static void __ieee80211_sta_join_ibss(st
+       skb_reset_tail_pointer(skb);
+       skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
+ 
+-      if (memcmp(ifibss->bssid, bssid, ETH_ALEN))
++      if (compare_ether_addr(ifibss->bssid, bssid))
+               sta_info_flush(sdata->local, sdata);
+ 
+       /* if merging, indicate to driver that we leave the old IBSS */
+@@ -403,7 +403,7 @@ static void ieee80211_rx_bss_info(struct
+               return;
+ 
+       if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
+-          memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(mgmt->bssid, sdata->u.ibss.bssid) == 0) {
+ 
+               rcu_read_lock();
+               sta = sta_info_get(sdata, mgmt->sa);
+@@ -508,7 +508,7 @@ static void ieee80211_rx_bss_info(struct
+               goto put_bss;
+ 
+       /* same BSSID */
+-      if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
++      if (compare_ether_addr(cbss->bssid, sdata->u.ibss.bssid) == 0)
+               goto put_bss;
+ 
+       if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
+@@ -831,8 +831,8 @@ static void ieee80211_rx_mgmt_probe_req(
+       if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
+               return;
+ 
+-      if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
+-          memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
++      if (compare_ether_addr(mgmt->bssid, ifibss->bssid) != 0 &&
++          !is_broadcast_ether_addr(mgmt->bssid))
+               return;
+ 
+       end = ((u8 *) mgmt) + len;
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
+@@ -204,7 +204,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80
+                       kmem_cache_free(rm_cache, p);
+                       --entries;
+               } else if ((seqnum == p->seqnum) &&
+-                         (memcmp(sa, p->sa, ETH_ALEN) == 0))
++                         (compare_ether_addr(sa, p->sa) == 0))
+                       return -1;
+       }
+ 
+--- a/net/mac80211/mesh_hwmp.c
++++ b/net/mac80211/mesh_hwmp.c
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/slab.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ #include "wme.h"
+ #include "mesh.h"
+@@ -419,7 +420,7 @@ static u32 hwmp_route_info_get(struct ie
+               new_metric = MAX_METRIC;
+       exp_time = TU_TO_EXP_TIME(orig_lifetime);
+ 
+-      if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0) {
++      if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0) {
+               /* This MP is the originator, we are not interested in this
+                * frame, except for updating transmitter's path info.
+                */
+@@ -469,7 +470,7 @@ static u32 hwmp_route_info_get(struct ie
+ 
+       /* Update and check transmitter routing info */
+       ta = mgmt->sa;
+-      if (memcmp(orig_addr, ta, ETH_ALEN) == 0)
++      if (compare_ether_addr(orig_addr, ta) == 0)
+               fresh_info = false;
+       else {
+               fresh_info = true;
+@@ -529,7 +530,7 @@ static void hwmp_preq_frame_process(stru
+ 
+       mhwmp_dbg("received PREQ from %pM", orig_addr);
+ 
+-      if (memcmp(target_addr, sdata->vif.addr, ETH_ALEN) == 0) {
++      if (compare_ether_addr(target_addr, sdata->vif.addr) == 0) {
+               mhwmp_dbg("PREQ is for us");
+               forward = false;
+               reply = true;
+@@ -624,7 +625,7 @@ static void hwmp_prep_frame_process(stru
+       mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
+ 
+       orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
+-      if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
++      if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
+               /* destination, no forwarding required */
+               return;
+ 
+@@ -694,10 +695,12 @@ static void hwmp_perr_frame_process(stru
+       rcu_read_lock();
+       mpath = mesh_path_lookup(target_addr, sdata);
+       if (mpath) {
++              struct sta_info *sta;
++
+               spin_lock_bh(&mpath->state_lock);
++              sta = next_hop_deref_protected(mpath);
+               if (mpath->flags & MESH_PATH_ACTIVE &&
+-                  memcmp(ta, next_hop_deref_protected(mpath)->sta.addr,
+-                                                      ETH_ALEN) == 0 &&
++                  compare_ether_addr(ta, sta->sta.addr) == 0 &&
+                   (!(mpath->flags & MESH_PATH_SN_VALID) ||
+                   SN_GT(target_sn, mpath->sn))) {
+                       mpath->flags &= ~MESH_PATH_ACTIVE;
+@@ -739,7 +742,7 @@ static void hwmp_rann_frame_process(stru
+       metric = rann->rann_metric;
+ 
+       /*  Ignore our own RANNs */
+-      if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
++      if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
+               return;
+ 
+       mhwmp_dbg("received RANN from %pM (is_gate=%d)", orig_addr,
+@@ -1064,7 +1067,7 @@ int mesh_nexthop_lookup(struct sk_buff *
+       if (time_after(jiffies,
+                      mpath->exp_time -
+                      msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
+-          !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
++          !compare_ether_addr(sdata->vif.addr, hdr->addr4) &&
+           !(mpath->flags & MESH_PATH_RESOLVING) &&
+           !(mpath->flags & MESH_PATH_FIXED))
+               mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
+--- a/net/mac80211/mesh_pathtbl.c
++++ b/net/mac80211/mesh_pathtbl.c
+@@ -350,7 +350,7 @@ static struct mesh_path *mpath_lookup(st
+       hlist_for_each_entry_rcu(node, n, bucket, list) {
+               mpath = node->mpath;
+               if (mpath->sdata == sdata &&
+-                              memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
++                              compare_ether_addr(dst, mpath->dst) == 0) {
+                       if (MPATH_EXPIRED(mpath)) {
+                               spin_lock_bh(&mpath->state_lock);
+                               mpath->flags &= ~MESH_PATH_ACTIVE;
+@@ -525,7 +525,7 @@ int mesh_path_add(u8 *dst, struct ieee80
+       int err = 0;
+       u32 hash_idx;
+ 
+-      if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
++      if (compare_ether_addr(dst, sdata->vif.addr) == 0)
+               /* never add ourselves as neighbours */
+               return -ENOTSUPP;
+ 
+@@ -566,7 +566,8 @@ int mesh_path_add(u8 *dst, struct ieee80
+       err = -EEXIST;
+       hlist_for_each_entry(node, n, bucket, list) {
+               mpath = node->mpath;
+-              if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
++              if (mpath->sdata == sdata &&
++                  compare_ether_addr(dst, mpath->dst) == 0)
+                       goto err_exists;
+       }
+ 
+@@ -657,7 +658,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
+       int err = 0;
+       u32 hash_idx;
+ 
+-      if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
++      if (compare_ether_addr(dst, sdata->vif.addr) == 0)
+               /* never add ourselves as neighbours */
+               return -ENOTSUPP;
+ 
+@@ -694,7 +695,8 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
+       err = -EEXIST;
+       hlist_for_each_entry(node, n, bucket, list) {
+               mpath = node->mpath;
+-              if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
++              if (mpath->sdata == sdata &&
++                  compare_ether_addr(dst, mpath->dst) == 0)
+                       goto err_exists;
+       }
+ 
+@@ -887,7 +889,7 @@ int mesh_path_del(u8 *addr, struct ieee8
+       hlist_for_each_entry(node, n, bucket, list) {
+               mpath = node->mpath;
+               if (mpath->sdata == sdata &&
+-                  memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
++                  compare_ether_addr(addr, mpath->dst) == 0) {
+                       __mesh_path_del(tbl, node);
+                       goto enddel;
+               }
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -1812,7 +1812,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_
+ 
+       memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
+ 
+-      if (memcmp(bssid, mgmt->bssid, ETH_ALEN))
++      if (compare_ether_addr(bssid, mgmt->bssid))
+               return RX_MGMT_NONE;
+ 
+       auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+@@ -1893,7 +1893,7 @@ ieee80211_rx_mgmt_deauth(struct ieee8021
+               return RX_MGMT_NONE;
+ 
+       if (!ifmgd->associated ||
+-          memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++          compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+               return RX_MGMT_NONE;
+ 
+       bssid = ifmgd->associated->bssid;
+@@ -1925,7 +1925,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80
+               return RX_MGMT_NONE;
+ 
+       if (!ifmgd->associated ||
+-          memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++          compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+               return RX_MGMT_NONE;
+ 
+       reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+@@ -2190,7 +2190,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
+ 
+       if (!assoc_data)
+               return RX_MGMT_NONE;
+-      if (memcmp(assoc_data->bss->bssid, mgmt->bssid, ETH_ALEN))
++      if (compare_ether_addr(assoc_data->bss->bssid, mgmt->bssid))
+               return RX_MGMT_NONE;

  
        /*
  
        /*

-        * If adding more here, adjust code in main.c
-@@ -1443,3 +1428,100 @@ int ieee80211_add_ext_srates_ie(struct i
+@@ -2278,8 +2278,8 @@ static void ieee80211_rx_bss_info(struct
+       bool need_ps = false;
+ 
+       if (sdata->u.mgd.associated &&
+-          memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid,
+-                 ETH_ALEN) == 0) {
++          compare_ether_addr(mgmt->bssid, sdata->u.mgd.associated->bssid)
++          == 0) {
+               bss = (void *)sdata->u.mgd.associated->priv;
+               /* not previously set so we may need to recalc */
+               need_ps = !bss->dtim_period;
+@@ -2334,7 +2334,7 @@ static void ieee80211_rx_mgmt_probe_resp
+ 
+       ASSERT_MGD_MTX(ifmgd);
+ 
+-      if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
++      if (compare_ether_addr(mgmt->da, sdata->vif.addr))
+               return; /* ignore ProbeResp to foreign address */
+ 
+       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
+@@ -2347,11 +2347,12 @@ static void ieee80211_rx_mgmt_probe_resp
+       ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
+ 
+       if (ifmgd->associated &&
+-          memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0)
++          compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid) == 0)
+               ieee80211_reset_ap_probe(sdata);
+ 
+       if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
+-          memcmp(mgmt->bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(mgmt->bssid, ifmgd->auth_data->bss->bssid)
++          == 0) {
+               /* got probe response, continue with auth */
+               printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
+               ifmgd->auth_data->tries = 0;
+@@ -2408,7 +2409,8 @@ static void ieee80211_rx_mgmt_beacon(str
+               return;
+ 
+       if (ifmgd->assoc_data && !ifmgd->assoc_data->have_beacon &&
+-          memcmp(mgmt->bssid, ifmgd->assoc_data->bss->bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(mgmt->bssid, ifmgd->assoc_data->bss->bssid)
++          == 0) {
+               ieee802_11_parse_elems(mgmt->u.beacon.variable,
+                                      len - baselen, &elems);
+ 
+@@ -2423,7 +2425,7 @@ static void ieee80211_rx_mgmt_beacon(str

        }
        }

-       return 0;
+ 
+       if (!ifmgd->associated ||
+-          memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++          compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+               return;
+       bssid = ifmgd->associated->bssid;
+ 
+@@ -3285,7 +3287,7 @@ int ieee80211_mgd_assoc(struct ieee80211
+               bool match;
+ 
+               /* keep sta info, bssid if matching */
+-              match = memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN) == 0;
++              match = compare_ether_addr(ifmgd->bssid, req->bss->bssid) == 0;
+               ieee80211_destroy_auth_data(sdata, match);
+       }
+ 
+@@ -3407,7 +3409,7 @@ int ieee80211_mgd_assoc(struct ieee80211
+                       goto err_clear;
+               }
+       } else
+-              WARN_ON_ONCE(memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN));
++              WARN_ON_ONCE(compare_ether_addr(ifmgd->bssid, req->bss->bssid));
+ 
+       if (!bss->dtim_period &&
+           sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
+@@ -3448,7 +3450,7 @@ int ieee80211_mgd_deauth(struct ieee8021
+       mutex_lock(&ifmgd->mtx);
+ 
+       if (ifmgd->associated &&
+-          memcmp(ifmgd->associated->bssid, req->bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(ifmgd->associated->bssid, req->bssid) == 0) {
+               ieee80211_set_disassoc(sdata, false, true);
+               assoc_bss = true;
+       } else if (ifmgd->auth_data) {
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <linux/export.h>
++#include <linux/etherdevice.h>
+ #include <net/mac80211.h>
+ #include <asm/unaligned.h>
+ #include "ieee80211_i.h"
+@@ -377,7 +378,7 @@ void ieee80211_tx_status(struct ieee8021
+ 
+       for_each_sta_info(local, hdr->addr1, sta, tmp) {
+               /* skip wrong virtual interface */
+-              if (memcmp(hdr->addr2, sta->sdata->vif.addr, ETH_ALEN))
++              if (compare_ether_addr(hdr->addr2, sta->sdata->vif.addr))
+                       continue;
+ 
+               if (info->flags & IEEE80211_TX_STATUS_EOSP)
+--- a/net/wireless/mlme.c
++++ b/net/wireless/mlme.c
+@@ -6,6 +6,7 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/etherdevice.h>
+ #include <linux/netdevice.h>
+ #include <linux/nl80211.h>
+ #include <linux/slab.h>
+@@ -100,7 +101,7 @@ void __cfg80211_send_deauth(struct net_d
+       ASSERT_WDEV_LOCK(wdev);
+ 
+       if (wdev->current_bss &&
+-          memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
+               cfg80211_unhold_bss(wdev->current_bss);
+               cfg80211_put_bss(&wdev->current_bss->pub);
+               wdev->current_bss = NULL;
+@@ -115,7 +116,7 @@ void __cfg80211_send_deauth(struct net_d
+ 
+               reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
+ 
+-              from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
++              from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
+               __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
+       } else if (wdev->sme_state == CFG80211_SME_CONNECTING) {
+               __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
+@@ -154,7 +155,7 @@ void __cfg80211_send_disassoc(struct net
+               return;
+ 
+       if (wdev->current_bss &&
+-          memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
+               cfg80211_sme_disassoc(dev, wdev->current_bss);
+               cfg80211_unhold_bss(wdev->current_bss);
+               cfg80211_put_bss(&wdev->current_bss->pub);
+@@ -165,7 +166,7 @@ void __cfg80211_send_disassoc(struct net
+ 
+       reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+ 
+-      from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
++      from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
+       __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);

  }
  }

+ EXPORT_SYMBOL(__cfg80211_send_disassoc);
+@@ -285,7 +286,7 @@ int __cfg80211_mlme_auth(struct cfg80211
+                       return -EINVAL;
+ 
+       if (wdev->current_bss &&
+-          memcmp(bssid, wdev->current_bss->pub.bssid, ETH_ALEN) == 0)
++          compare_ether_addr(bssid, wdev->current_bss->pub.bssid) == 0)
+               return -EALREADY;
+ 
+       memset(&req, 0, sizeof(req));
+@@ -362,7 +363,7 @@ int __cfg80211_mlme_assoc(struct cfg8021
+       memset(&req, 0, sizeof(req));
+ 
+       if (wdev->current_bss && prev_bssid &&
+-          memcmp(wdev->current_bss->pub.bssid, prev_bssid, ETH_ALEN) == 0) {
++          compare_ether_addr(wdev->current_bss->pub.bssid, prev_bssid) == 0) {
+               /*
+                * Trying to reassociate: Allow this to proceed and let the old
+                * association to be dropped when the new one is completed.
+@@ -446,7 +447,8 @@ int __cfg80211_mlme_deauth(struct cfg802
+ 
+       if (local_state_change) {
+               if (wdev->current_bss &&
+-                  memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++                  compare_ether_addr(wdev->current_bss->pub.bssid, bssid)
++                  == 0) {
+                       cfg80211_unhold_bss(wdev->current_bss);
+                       cfg80211_put_bss(&wdev->current_bss->pub);
+                       wdev->current_bss = NULL;
+@@ -495,7 +497,7 @@ static int __cfg80211_mlme_disassoc(stru
+       req.local_state_change = local_state_change;
+       req.ie = ie;
+       req.ie_len = ie_len;
+-      if (memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0)
++      if (compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0)
+               req.bss = &wdev->current_bss->pub;
+       else
+               return -ENOTCONN;
+@@ -758,8 +760,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+                               break;
+                       }
+ 
+-                      if (memcmp(wdev->current_bss->pub.bssid,
+-                                 mgmt->bssid, ETH_ALEN)) {
++                      if (compare_ether_addr(wdev->current_bss->pub.bssid,
++                                             mgmt->bssid)) {
+                               err = -ENOTCONN;
+                               break;
+                       }
+@@ -772,8 +774,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+                               break;
+ 
+                       /* for station, check that DA is the AP */
+-                      if (memcmp(wdev->current_bss->pub.bssid,
+-                                 mgmt->da, ETH_ALEN)) {
++                      if (compare_ether_addr(wdev->current_bss->pub.bssid,
++                                             mgmt->da)) {
+                               err = -ENOTCONN;
+                               break;
+                       }
+@@ -781,11 +783,11 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+               case NL80211_IFTYPE_AP:
+               case NL80211_IFTYPE_P2P_GO:
+               case NL80211_IFTYPE_AP_VLAN:
+-                      if (memcmp(mgmt->bssid, dev->dev_addr, ETH_ALEN))
++                      if (compare_ether_addr(mgmt->bssid, dev->dev_addr))
+                               err = -EINVAL;
+                       break;
+               case NL80211_IFTYPE_MESH_POINT:
+-                      if (memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN)) {
++                      if (compare_ether_addr(mgmt->sa, mgmt->bssid)) {
+                               err = -EINVAL;
+                               break;
+                       }
+@@ -804,7 +806,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+                       return err;
+       }
+ 
+-      if (memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0)
++      if (compare_ether_addr(mgmt->sa, dev->dev_addr) != 0)
+               return -EINVAL;
+ 
+       /* Transmit the Action frame as requested by user space */
+--- a/net/wireless/scan.c
++++ b/net/wireless/scan.c
+@@ -378,7 +378,7 @@ static int cmp_bss_core(struct cfg80211_
+                              b->len_information_elements);
+       }
+ 
+-      return memcmp(a->bssid, b->bssid, ETH_ALEN);
++      return compare_ether_addr(a->bssid, b->bssid);
+ }
+ 
+ static int cmp_bss(struct cfg80211_bss *a,
+--- a/drivers/net/wireless/ath/ath9k/Kconfig
++++ b/drivers/net/wireless/ath/ath9k/Kconfig
+@@ -81,6 +81,14 @@ config ATH9K_DFS_CERTIFIED
+         developed. At this point enabling this option won't do anything
+         except increase code size.
+ 
++config ATH9K_MAC_DEBUG
++      bool "Atheros MAC statistics"
++      depends on ATH9K_DEBUGFS
++      default y
++      ---help---
++        This option enables collection of statistics for Rx/Tx status
++        data and some other MAC related statistics

 +
 +

-+u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_supported_band *sband,
-+                            u16 cap)
-+{
-+      __le16 tmp;
-+
-+      *pos++ = WLAN_EID_HT_CAPABILITY;
-+      *pos++ = sizeof(struct ieee80211_ht_cap);
-+      memset(pos, 0, sizeof(struct ieee80211_ht_cap));
-+
-+      /* capability flags */
-+      tmp = cpu_to_le16(cap);
-+      memcpy(pos, &tmp, sizeof(u16));
-+      pos += sizeof(u16);
-+
-+      /* AMPDU parameters */
-+      *pos++ = sband->ht_cap.ampdu_factor |
-+               (sband->ht_cap.ampdu_density <<
-+                      IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
+ config ATH9K_RATE_CONTROL
+       bool "Atheros ath9k rate control"
+       depends on ATH9K
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -818,6 +818,7 @@ void ath_debug_stat_tx(struct ath_softc 
+       if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)
+               TX_STAT_INC(qnum, delim_underrun);
+ 
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+       spin_lock(&sc->debug.samp_lock);
+       TX_SAMP_DBG(jiffies) = jiffies;
+       TX_SAMP_DBG(rssi_ctl0) = ts->ts_rssi_ctl0;
+@@ -844,6 +845,7 @@ void ath_debug_stat_tx(struct ath_softc 
+ 
+       sc->debug.tsidx = (sc->debug.tsidx + 1) % ATH_DBG_MAX_SAMPLES;
+       spin_unlock(&sc->debug.samp_lock);
++#endif
+ 
+ #undef TX_SAMP_DBG
+ }
+@@ -942,27 +944,6 @@ static ssize_t read_file_recv(struct fil
+       PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL);
+ 
+       len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-CTL0",
+-                      sc->debug.stats.rxstats.rs_rssi_ctl0);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-CTL1",
+-                      sc->debug.stats.rxstats.rs_rssi_ctl1);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-CTL2",
+-                      sc->debug.stats.rxstats.rs_rssi_ctl2);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-EXT0",
+-                      sc->debug.stats.rxstats.rs_rssi_ext0);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-EXT1",
+-                      sc->debug.stats.rxstats.rs_rssi_ext1);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-EXT2",
+-                      sc->debug.stats.rxstats.rs_rssi_ext2);
+-      len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "Rx Antenna",
+-                      sc->debug.stats.rxstats.rs_antenna);
+-      len += snprintf(buf + len, size - len,
+                       "%22s : %10u\n", "RX-Pkts-All",
+                       sc->debug.stats.rxstats.rx_pkts_all);
+       len += snprintf(buf + len, size - len,
+@@ -1009,16 +990,7 @@ void ath_debug_stat_rx(struct ath_softc 
+                       RX_PHY_ERR_INC(rs->rs_phyerr);
+       }
+ 
+-      sc->debug.stats.rxstats.rs_rssi_ctl0 = rs->rs_rssi_ctl0;
+-      sc->debug.stats.rxstats.rs_rssi_ctl1 = rs->rs_rssi_ctl1;
+-      sc->debug.stats.rxstats.rs_rssi_ctl2 = rs->rs_rssi_ctl2;
+-
+-      sc->debug.stats.rxstats.rs_rssi_ext0 = rs->rs_rssi_ext0;
+-      sc->debug.stats.rxstats.rs_rssi_ext1 = rs->rs_rssi_ext1;
+-      sc->debug.stats.rxstats.rs_rssi_ext2 = rs->rs_rssi_ext2;
+-
+-      sc->debug.stats.rxstats.rs_antenna = rs->rs_antenna;
+-
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+       spin_lock(&sc->debug.samp_lock);
+       RX_SAMP_DBG(jiffies) = jiffies;
+       RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
+@@ -1035,6 +1007,8 @@ void ath_debug_stat_rx(struct ath_softc 
+       sc->debug.rsidx = (sc->debug.rsidx + 1) % ATH_DBG_MAX_SAMPLES;
+       spin_unlock(&sc->debug.samp_lock);
+ 
++#endif

 +
 +

-+      /* MCS set */
-+      memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
-+      pos += sizeof(sband->ht_cap.mcs);
+ #undef RX_STAT_INC
+ #undef RX_PHY_ERR_INC
+ #undef RX_SAMP_DBG
+@@ -1278,6 +1252,8 @@ static const struct file_operations fops
+       .llseek = default_llseek,
+ };
+ 
++#ifdef CONFIG_ATH9K_MAC_DEBUG

 +
 +

-+      /* extended capabilities */
-+      pos += sizeof(__le16);
+ void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
+ {
+ #define ATH_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].c)
+@@ -1551,6 +1527,7 @@ static const struct file_operations fops
+       .llseek = default_llseek,
+ };
+ 
++#endif
+ 
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+@@ -1604,8 +1581,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+                           &fops_base_eeprom);
+       debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_modal_eeprom);
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+       debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_samps);
++#endif
+ 
+       debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
+                          sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
+--- a/drivers/net/wireless/ath/ath9k/debug.h
++++ b/drivers/net/wireless/ath/ath9k/debug.h
+@@ -165,13 +165,6 @@ struct ath_rx_stats {
+       u32 post_delim_crc_err;
+       u32 decrypt_busy_err;
+       u32 phy_err_stats[ATH9K_PHYERR_MAX];
+-      int8_t rs_rssi_ctl0;
+-      int8_t rs_rssi_ctl1;
+-      int8_t rs_rssi_ctl2;
+-      int8_t rs_rssi_ext0;
+-      int8_t rs_rssi_ext1;
+-      int8_t rs_rssi_ext2;
+-      u8 rs_antenna;
+ };
+ 
+ enum ath_reset_type {
+@@ -235,16 +228,17 @@ struct ath9k_debug {
+       struct dentry *debugfs_phy;
+       u32 regidx;
+       struct ath_stats stats;
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+       spinlock_t samp_lock;
+       struct ath_dbg_bb_mac_samp bb_mac_samp[ATH_DBG_MAX_SAMPLES];
+       u8 sampidx;
+       u8 tsidx;
+       u8 rsidx;
++#endif
+ };
+ 
+ int ath9k_init_debug(struct ath_hw *ah);
+ 
+-void ath9k_debug_samp_bb_mac(struct ath_softc *sc);
+ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status);
+ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
+                      struct ath_tx_status *ts, struct ath_txq *txq,
+@@ -258,10 +252,6 @@ static inline int ath9k_init_debug(struc
+       return 0;
+ }
+ 
+-static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
+-{
+-}
+-
+ static inline void ath_debug_stat_interrupt(struct ath_softc *sc,
+                                           enum ath9k_int status)
+ {
+@@ -282,4 +272,17 @@ static inline void ath_debug_stat_rx(str
+ 
+ #endif /* CONFIG_ATH9K_DEBUGFS */
+ 
++#ifdef CONFIG_ATH9K_MAC_DEBUG

 +
 +

-+      /* BF capabilities */
-+      pos += sizeof(__le32);
++void ath9k_debug_samp_bb_mac(struct ath_softc *sc);

 +
 +

-+      /* antenna selection */
-+      pos += sizeof(u8);
++#else

 +
 +

-+      return pos;
++static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
++{

 +}
 +
 +}
 +

-+u8 *ieee80211_ie_build_ht_info(u8 *pos,
-+                             struct ieee80211_sta_ht_cap *ht_cap,
-+                             struct ieee80211_channel *channel,
-+                             enum nl80211_channel_type channel_type)
-+{
-+      struct ieee80211_ht_info *ht_info;
-+      /* Build HT Information */
-+      *pos++ = WLAN_EID_HT_INFORMATION;
-+      *pos++ = sizeof(struct ieee80211_ht_info);
-+      ht_info = (struct ieee80211_ht_info *)pos;
-+      ht_info->control_chan =
-+                      ieee80211_frequency_to_channel(channel->center_freq);
-+      switch (channel_type) {
-+      case NL80211_CHAN_HT40MINUS:
-+              ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-+              break;
-+      case NL80211_CHAN_HT40PLUS:
-+              ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-+              break;
-+      case NL80211_CHAN_HT20:
-+      default:
-+              ht_info->ht_param = IEEE80211_HT_PARAM_CHA_SEC_NONE;
-+              break;
-+      }
-+      if (ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
-+              ht_info->ht_param |= IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
-+      ht_info->operation_mode = 0x0000;
-+      ht_info->stbc_param = 0x0000;
++#endif

 +
 +

-+      /* It seems that Basic MCS set and Supported MCS set
-+         are identical for the first 10 bytes */
-+      memset(&ht_info->basic_set, 0, 16);
-+      memcpy(&ht_info->basic_set, &ht_cap->mcs, 10);

 +
 +

-+      return pos + sizeof(struct ieee80211_ht_info);
-+}
+ #endif /* DEBUG_H */
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -555,9 +555,11 @@ static int ath9k_init_softc(u16 devid, s
+       mutex_init(&sc->mutex);
+ #ifdef CONFIG_ATH9K_DEBUGFS
+       spin_lock_init(&sc->nodes_lock);
+-      spin_lock_init(&sc->debug.samp_lock);
+       INIT_LIST_HEAD(&sc->nodes);
+ #endif
++#ifdef CONFIG_ATH9K_MAC_DEBUG
++      spin_lock_init(&sc->debug.samp_lock);
++#endif
+       tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
+       tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
+                    (unsigned long)sc);
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1386,10 +1386,16 @@ static bool ath9k_hw_set_reset_reg(struc
+ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
+                               struct ath9k_channel *chan)
+ {
+-      if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) {
+-              if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON))
+-                      return false;
+-      } else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
++      int reset_type = ATH9K_RESET_WARM;

 +
 +

-+enum nl80211_channel_type
-+ieee80211_ht_info_to_channel_type(struct ieee80211_ht_info *ht_info)
-+{
-+      enum nl80211_channel_type channel_type;
-+
-+      if (!ht_info)
-+              return NL80211_CHAN_NO_HT;
-+
-+      switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
-+      case IEEE80211_HT_PARAM_CHA_SEC_NONE:
-+              channel_type = NL80211_CHAN_HT20;
-+              break;
-+      case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-+              channel_type = NL80211_CHAN_HT40PLUS;
-+              break;
-+      case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-+              channel_type = NL80211_CHAN_HT40MINUS;
-+              break;
-+      default:
-+              channel_type = NL80211_CHAN_NO_HT;
++      if (AR_SREV_9280(ah)) {
++              if (ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
++                      reset_type = ATH9K_RESET_POWER_ON;
++              else
++                      reset_type = ATH9K_RESET_COLD;

 +      }
 +
 +      }
 +

-+      return channel_type;
-+}
---- a/net/mac80211/work.c
-+++ b/net/mac80211/work.c
-@@ -118,7 +118,6 @@ static void ieee80211_add_ht_ie(struct s
-       u8 *pos;
-       u32 flags = channel->flags;
-       u16 cap = sband->ht_cap.cap;
--      __le16 tmp;
- 
-       if (!sband->ht_cap.ht_supported)
-               return;
-@@ -169,34 +168,8 @@ static void ieee80211_add_ht_ie(struct s
-       }
++      if (!ath9k_hw_set_reset_reg(ah, reset_type))
+               return false;

  
  

-       /* reserve and fill IE */
--
-       pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
--      *pos++ = WLAN_EID_HT_CAPABILITY;
--      *pos++ = sizeof(struct ieee80211_ht_cap);
--      memset(pos, 0, sizeof(struct ieee80211_ht_cap));
--
--      /* capability flags */
--      tmp = cpu_to_le16(cap);
--      memcpy(pos, &tmp, sizeof(u16));
--      pos += sizeof(u16);
--
--      /* AMPDU parameters */
--      *pos++ = sband->ht_cap.ampdu_factor |
--               (sband->ht_cap.ampdu_density <<
--                      IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT);
+       if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -2330,15 +2330,6 @@ ath5k_calibrate_work(struct work_struct 
+                                       "got new rfgain, resetting\n");
+                       ieee80211_queue_work(ah->hw, &ah->reset_work);
+               }

 -
 -

--      /* MCS set */
--      memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
--      pos += sizeof(sband->ht_cap.mcs);
+-              /* TODO: On full calibration we should stop TX here,
+-               * so that it doesn't interfere (mostly due to gain_f
+-               * calibration that messes with tx packets -see phy.c).
+-               *
+-               * NOTE: Stopping the queues from above is not enough
+-               * to stop TX but saves us from disconecting (at least
+-               * we don't lose packets). */
+-              ieee80211_stop_queues(ah->hw);
+       } else
+               ah->ah_cal_mask |= AR5K_CALIBRATION_SHORT;
+ 
+@@ -2353,10 +2344,9 @@ ath5k_calibrate_work(struct work_struct 
+                               ah->curchan->center_freq));
+ 
+       /* Clear calibration flags */
+-      if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
+-              ieee80211_wake_queues(ah->hw);
++      if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL)
+               ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;
+-      } else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)
++      else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)
+               ah->ah_cal_mask &= ~AR5K_CALIBRATION_SHORT;
+ }
+ 
+--- a/drivers/net/wireless/ath/ath5k/phy.c
++++ b/drivers/net/wireless/ath/ath5k/phy.c
+@@ -1871,31 +1871,15 @@ ath5k_hw_phy_calibrate(struct ath5k_hw *
+               ret = 0;
+       }
+ 
+-      /* On full calibration do an AGC calibration and
+-       * request a PAPD probe for gainf calibration if
+-       * needed */
+-      if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
++      /* On full calibration request a PAPD probe for
++       * gainf calibration if needed */
++      if ((ah->ah_cal_mask & AR5K_CALIBRATION_FULL) &&
++          (ah->ah_radio == AR5K_RF5111 ||
++           ah->ah_radio == AR5K_RF5112) &&
++          channel->hw_value != AR5K_MODE_11B)
++              ath5k_hw_request_rfgain_probe(ah);
+ 
+-              AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,
+-                                      AR5K_PHY_AGCCTL_CAL);

 -
 -

--      /* extended capabilities */
--      pos += sizeof(__le16);
+-              ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,
+-                      AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF,
+-                      0, false);
+-              if (ret) {
+-                      ATH5K_ERR(ah,
+-                              "gain calibration timeout (%uMHz)\n",
+-                              channel->center_freq);
+-              }

 -
 -

--      /* BF capabilities */
--      pos += sizeof(__le32);
+-              if ((ah->ah_radio == AR5K_RF5111 ||
+-                      ah->ah_radio == AR5K_RF5112)
+-                      && (channel->hw_value != AR5K_MODE_11B))
+-                      ath5k_hw_request_rfgain_probe(ah);
+-      }

 -
 -

--      /* antenna selection */
--      pos += sizeof(u8);
-+      ieee80211_ie_build_ht_cap(pos, sband, cap);
+-      /* Update noise floor
+-       * XXX: Only do this after AGC calibration */
++      /* Update noise floor */
+       if (!(ah->ah_cal_mask & AR5K_CALIBRATION_NF))
+               ath5k_hw_update_noise_floor(ah);
+ 
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -232,7 +232,6 @@ static void ath_rx_edma_cleanup(struct a
+ static void ath_rx_edma_init_queue(struct ath_rx_edma *rx_edma, int size)
+ {
+       skb_queue_head_init(&rx_edma->rx_fifo);
+-      skb_queue_head_init(&rx_edma->rx_buffers);
+       rx_edma->rx_fifo_hwsize = size;

  }
  
  }
  

- static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
---- a/net/wireless/chan.c
-+++ b/net/wireless/chan.c
-@@ -44,9 +44,9 @@ rdev_freq_to_chan(struct cfg80211_regist
-       return chan;
+@@ -658,7 +657,9 @@ static void ath_rx_ps(struct ath_softc *

  }
  
  }
  

--static bool can_beacon_sec_chan(struct wiphy *wiphy,
--                              struct ieee80211_channel *chan,
--                              enum nl80211_channel_type channel_type)
-+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
-+                                struct ieee80211_channel *chan,
-+                                enum nl80211_channel_type channel_type)
+ static bool ath_edma_get_buffers(struct ath_softc *sc,
+-                               enum ath9k_rx_qtype qtype)
++                               enum ath9k_rx_qtype qtype,
++                               struct ath_rx_status *rs,
++                               struct ath_buf **dest)

  {
  {

-       struct ieee80211_channel *sec_chan;
-       int diff;
-@@ -75,6 +75,7 @@ static bool can_beacon_sec_chan(struct w
+       struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype];
+       struct ath_hw *ah = sc->sc_ah;
+@@ -677,7 +678,7 @@ static bool ath_edma_get_buffers(struct 
+       dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
+                               common->rx_bufsize, DMA_FROM_DEVICE);
+ 
+-      ret = ath9k_hw_process_rxdesc_edma(ah, NULL, skb->data);
++      ret = ath9k_hw_process_rxdesc_edma(ah, rs, skb->data);
+       if (ret == -EINPROGRESS) {
+               /*let device gain the buffer again*/
+               dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
+@@ -690,20 +691,21 @@ static bool ath_edma_get_buffers(struct 
+               /* corrupt descriptor, skip this one and the following one */
+               list_add_tail(&bf->list, &sc->rx.rxbuf);
+               ath_rx_edma_buf_link(sc, qtype);
+-              skb = skb_peek(&rx_edma->rx_fifo);
+-              if (!skb)
+-                      return true;

  
  

+-              bf = SKB_CB_ATHBUF(skb);
+-              BUG_ON(!bf);
++              skb = skb_peek(&rx_edma->rx_fifo);
++              if (skb) {
++                      bf = SKB_CB_ATHBUF(skb);
++                      BUG_ON(!bf);
+ 
+-              __skb_unlink(skb, &rx_edma->rx_fifo);
+-              list_add_tail(&bf->list, &sc->rx.rxbuf);
+-              ath_rx_edma_buf_link(sc, qtype);
+-              return true;
++                      __skb_unlink(skb, &rx_edma->rx_fifo);
++                      list_add_tail(&bf->list, &sc->rx.rxbuf);
++                      ath_rx_edma_buf_link(sc, qtype);
++              } else {
++                      bf = NULL;
++              }
+       }
+-      skb_queue_tail(&rx_edma->rx_buffers, skb);
+ 
++      *dest = bf;

        return true;
  }
        return true;
  }

-+EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
- 
- int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
-                     struct wireless_dev *wdev, int freq,
-@@ -109,8 +110,8 @@ int cfg80211_set_freq(struct cfg80211_re
-               switch (channel_type) {
-               case NL80211_CHAN_HT40PLUS:
-               case NL80211_CHAN_HT40MINUS:
--                      if (!can_beacon_sec_chan(&rdev->wiphy, chan,
--                                               channel_type)) {
-+                      if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
-+                                                        channel_type)) {
-                               printk(KERN_DEBUG
-                                      "cfg80211: Secondary channel not "
-                                      "allowed to initiate communication\n");
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -4574,13 +4574,34 @@ static int nl80211_join_ibss(struct sk_b
-               ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
-       }

  
  

--      ibss.channel = ieee80211_get_channel(wiphy,
--              nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
-+      if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
-+              enum nl80211_channel_type channel_type;
-+
-+              channel_type = nla_get_u32(
-+                              info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
-+              if (channel_type > NL80211_CHAN_HT40PLUS)
-+                      return -EINVAL;
-+              ibss.channel_type = channel_type;
-+      } else {
-+              ibss.channel_type = NL80211_CHAN_NO_HT;
+@@ -711,18 +713,15 @@ static struct ath_buf *ath_edma_get_next
+                                               struct ath_rx_status *rs,
+                                               enum ath9k_rx_qtype qtype)
+ {
+-      struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype];
+-      struct sk_buff *skb;
+-      struct ath_buf *bf;
++      struct ath_buf *bf = NULL;
+ 
+-      while (ath_edma_get_buffers(sc, qtype));
+-      skb = __skb_dequeue(&rx_edma->rx_buffers);
+-      if (!skb)
+-              return NULL;
++      while (ath_edma_get_buffers(sc, qtype, rs, &bf)) {
++              if (!bf)
++                      continue;
+ 
+-      bf = SKB_CB_ATHBUF(skb);
+-      ath9k_hw_process_rxdesc_edma(sc->sc_ah, rs, skb->data);
+-      return bf;
++              return bf;

 +      }
 +      }

++      return NULL;
+ }
+ 
+ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
+@@ -954,6 +953,7 @@ static void ath9k_process_rssi(struct at
+       struct ath_softc *sc = hw->priv;
+       struct ath_hw *ah = common->ah;
+       int last_rssi;
++      int rssi = rx_stats->rs_rssi;
+ 
+       if (!rx_stats->is_mybeacon ||
+           ((ah->opmode != NL80211_IFTYPE_STATION) &&
+@@ -965,13 +965,12 @@ static void ath9k_process_rssi(struct at
+ 
+       last_rssi = sc->last_rssi;
+       if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
+-              rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
+-                                            ATH_RSSI_EP_MULTIPLIER);
+-      if (rx_stats->rs_rssi < 0)
+-              rx_stats->rs_rssi = 0;
++              rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
++      if (rssi < 0)
++              rssi = 0;
+ 
+       /* Update Beacon RSSI, this is used by ANI. */
+-      ah->stats.avgbrssi = rx_stats->rs_rssi;
++      ah->stats.avgbrssi = rssi;
+ }
+ 
+ /*
+@@ -988,8 +987,6 @@ static int ath9k_rx_skb_preprocess(struc
+ {
+       struct ath_hw *ah = common->ah;
+ 
+-      memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
+-
+       /*
+        * everything but the rate is checked here, the rate check is done
+        * separately to avoid doing two lookups for a rate for each frame.
+@@ -1011,6 +1008,8 @@ static int ath9k_rx_skb_preprocess(struc
+       rx_status->signal = ah->noise + rx_stats->rs_rssi;
+       rx_status->antenna = rx_stats->rs_antenna;
+       rx_status->flag |= RX_FLAG_MACTIME_MPDU;
++      if (rx_stats->rs_moreaggr)
++              rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
+ 
+       return 0;
+ }
+@@ -1845,6 +1844,8 @@ int ath_rx_tasklet(struct ath_softc *sc,
+               if (sc->sc_flags & SC_OP_RXFLUSH)
+                       goto requeue_drop_frag;
+ 
++              memset(rxs, 0, sizeof(struct ieee80211_rx_status));

 +
 +

-+      ibss.channel = rdev_freq_to_chan(rdev,
-+              nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
-+              ibss.channel_type);
-       if (!ibss.channel ||
-+          ibss.channel->flags & IEEE80211_CHAN_RADAR ||
-           ibss.channel->flags & IEEE80211_CHAN_NO_IBSS ||
-           ibss.channel->flags & IEEE80211_CHAN_DISABLED)
-               return -EINVAL;
+               rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
+               if (rs.rs_tstamp > tsf_lower &&
+                   unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_
+       info.txpower = MAX_RATE_POWER;
+       info.keyix = ATH9K_TXKEYIX_INVALID;
+       info.keytype = ATH9K_KEY_TYPE_CLEAR;
+-      info.flags = ATH9K_TXDESC_NOACK;
++      info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ;

  
  

-+      /* Both channels should be able to initiate communication */
-+      if ((ibss.channel_type == NL80211_CHAN_HT40PLUS ||
-+           ibss.channel_type == NL80211_CHAN_HT40MINUS) &&
-+          !cfg80211_can_beacon_sec_chan(&rdev->wiphy, ibss.channel,
-+                                        ibss.channel_type))
-+              return -EINVAL;
+       info.buf_addr[0] = bf->bf_buf_addr;
+       info.buf_len[0] = roundup(skb->len, 4);
+@@ -355,7 +355,6 @@ 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;
+       bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
+       int slot;
+       u32 bfaddr, bc = 0;
+@@ -462,11 +461,6 @@ void ath_beacon_tasklet(unsigned long da
+                       ath9k_hw_txstart(ah, sc->beacon.beaconq);
+ 
+               sc->beacon.ast_be_xmit += bc;     /* XXX per-vif? */
+-              if (edma) {
+-                      spin_lock_bh(&sc->sc_pcu_lock);
+-                      ath9k_hw_txprocdesc(ah, bf->bf_desc, (void *)&ts);
+-                      spin_unlock_bh(&sc->sc_pcu_lock);
+-              }
+       }
+ }
+ 
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -745,7 +745,11 @@ int ath9k_hw_beaconq_setup(struct ath_hw
+       qi.tqi_aifs = 1;
+       qi.tqi_cwmin = 0;
+       qi.tqi_cwmax = 0;
+-      /* NB: don't enable any interrupts */
++
++      if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
++              qi.tqi_qflags = TXQ_FLAG_TXOKINT_ENABLE |
++                              TXQ_FLAG_TXERRINT_ENABLE;
++
+       return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi);
+ }
+ EXPORT_SYMBOL(ath9k_hw_beaconq_setup);
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -118,13 +118,15 @@ void ath9k_ps_restore(struct ath_softc *
+       if (--sc->ps_usecount != 0)
+               goto unlock;
+ 
+-      if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
++      if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
++              goto unlock;

 +
 +

-       ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED];
-       ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
++      if (sc->ps_idle)
+               mode = ATH9K_PM_FULL_SLEEP;
+       else if (sc->ps_enabled &&
+                !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
+                             PS_WAIT_FOR_CAB |
+-                            PS_WAIT_FOR_PSPOLL_DATA |
+-                            PS_WAIT_FOR_TX_ACK)))
++                            PS_WAIT_FOR_PSPOLL_DATA)))
+               mode = ATH9K_PM_NETWORK_SLEEP;
+       else
+               goto unlock;
+@@ -1955,6 +1957,7 @@ static void ath9k_config_bss(struct ath_
+               sc->sc_flags &= ~SC_OP_ANI_RUN;
+               del_timer_sync(&common->ani.timer);
+               memset(&sc->caldata, 0, sizeof(sc->caldata));
++              ath9k_hw_ani_init(sc->sc_ah);
+       }
+ }
+ 
+@@ -2300,6 +2303,7 @@ static int ath9k_tx_last_beacon(struct i
+       struct ath_vif *avp;
+       struct ath_buf *bf;
+       struct ath_tx_status ts;
++      bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
+       int status;
+ 
+       vif = sc->beacon.bslot[0];
+@@ -2310,7 +2314,7 @@ static int ath9k_tx_last_beacon(struct i
+       if (!avp->is_bslot_active)
+               return 0;
+ 
+-      if (!sc->beacon.tx_processed) {
++      if (!sc->beacon.tx_processed && !edma) {
+               tasklet_disable(&sc->bcon_tasklet);
+ 
+               bf = avp->av_bcbuf;
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -2296,9 +2296,12 @@ void ath_tx_edma_tasklet(struct ath_soft
+                       break;
+               }
+ 
+-              /* Skip beacon completions */
+-              if (ts.qid == sc->beacon.beaconq)
++              /* Process beacon completions separately */
++              if (ts.qid == sc->beacon.beaconq) {
++                      sc->beacon.tx_processed = true;
++                      sc->beacon.tx_last = !(ts.ts_status & ATH9K_TXERR_MASK);
+                       continue;
++              }
+ 
+               txq = &sc->tx.txq[ts.qid];
+ 
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -299,7 +299,6 @@ struct ath_tx {
+ 
+ struct ath_rx_edma {
+       struct sk_buff_head rx_fifo;
+-      struct sk_buff_head rx_buffers;
+       u32 rx_fifo_hwsize;
+ };
+ 
+--- a/drivers/net/wireless/ath/ath9k/ani.c
++++ b/drivers/net/wireless/ath/ath9k/ani.c
+@@ -46,8 +46,8 @@ static const struct ani_ofdm_level_entry
+       {  5,  4,  1  }, /* lvl 5 */
+       {  6,  5,  1  }, /* lvl 6 */
+       {  7,  6,  1  }, /* lvl 7 */
+-      {  7,  7,  1  }, /* lvl 8 */
+-      {  7,  8,  0  }  /* lvl 9 */
++      {  7,  6,  0  }, /* lvl 8 */
++      {  7,  7,  0  }  /* lvl 9 */
+ };
+ #define ATH9K_ANI_OFDM_NUM_LEVEL \
+       ARRAY_SIZE(ofdm_level_table)
+@@ -91,8 +91,8 @@ static const struct ani_cck_level_entry 
+       {  4,  0  }, /* lvl 4 */
+       {  5,  0  }, /* lvl 5 */
+       {  6,  0  }, /* lvl 6 */
+-      {  7,  0  }, /* lvl 7 (only for high rssi) */
+-      {  8,  0  }  /* lvl 8 (only for high rssi) */
++      {  6,  0  }, /* lvl 7 (only for high rssi) */
++      {  7,  0  }  /* lvl 8 (only for high rssi) */
+ };
+ 
+ #define ATH9K_ANI_CCK_NUM_LEVEL \
+@@ -290,16 +290,9 @@ static void ath9k_hw_set_ofdm_nil(struct
+                                    ATH9K_ANI_FIRSTEP_LEVEL,
+                                    entry_ofdm->fir_step_level);
+ 
+-      if ((ah->opmode != NL80211_IFTYPE_STATION &&
+-           ah->opmode != NL80211_IFTYPE_ADHOC) ||
+-          aniState->noiseFloor <= aniState->rssiThrHigh) {
+-              if (aniState->ofdmWeakSigDetectOff)
+-                      /* force on ofdm weak sig detect */
+-                      ath9k_hw_ani_control(ah,
+-                              ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+-                                           true);
+-              else if (aniState->ofdmWeakSigDetectOff ==
+-                       entry_ofdm->ofdm_weak_signal_on)
++      if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&
++          (aniState->ofdmWeakSigDetectOff !=
++           entry_ofdm->ofdm_weak_signal_on)) {
+                       ath9k_hw_ani_control(ah,
+                               ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+                               entry_ofdm->ofdm_weak_signal_on);
+@@ -717,26 +710,30 @@ void ath9k_hw_ani_monitor(struct ath_hw 
+               ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,
+               cckPhyErrRate, aniState->ofdmsTurn);
+ 
+-      if (aniState->listenTime > 5 * ah->aniperiod) {
+-              if (ofdmPhyErrRate <= ah->config.ofdm_trig_low &&
+-                  cckPhyErrRate <= ah->config.cck_trig_low) {
++      if (aniState->listenTime > ah->aniperiod) {
++              if (cckPhyErrRate < ah->config.cck_trig_low &&
++                  ((ofdmPhyErrRate < ah->config.ofdm_trig_low &&
++                    aniState->ofdmNoiseImmunityLevel <
++                    ATH9K_ANI_OFDM_DEF_LEVEL) ||
++                   (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI &&
++                    aniState->ofdmNoiseImmunityLevel >=
++                    ATH9K_ANI_OFDM_DEF_LEVEL))) {
+                       ath9k_hw_ani_lower_immunity(ah);
+                       aniState->ofdmsTurn = !aniState->ofdmsTurn;
+-              }
+-              ath9k_ani_restart(ah);
+-      } else if (aniState->listenTime > ah->aniperiod) {
+-              /* check to see if need to raise immunity */
+-              if (ofdmPhyErrRate > ah->config.ofdm_trig_high &&
+-                  (cckPhyErrRate <= ah->config.cck_trig_high ||
+-                   aniState->ofdmsTurn)) {
++              } else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high &&
++                          aniState->ofdmNoiseImmunityLevel >=
++                          ATH9K_ANI_OFDM_DEF_LEVEL) ||
++                         (ofdmPhyErrRate >
++                          ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI &&
++                          aniState->ofdmNoiseImmunityLevel <
++                          ATH9K_ANI_OFDM_DEF_LEVEL)) {
+                       ath9k_hw_ani_ofdm_err_trigger(ah);
+-                      ath9k_ani_restart(ah);
+                       aniState->ofdmsTurn = false;
+               } else if (cckPhyErrRate > ah->config.cck_trig_high) {
+                       ath9k_hw_ani_cck_err_trigger(ah);
+-                      ath9k_ani_restart(ah);
+                       aniState->ofdmsTurn = true;
+               }
++              ath9k_ani_restart(ah);
+       }
+ }
+ EXPORT_SYMBOL(ath9k_hw_ani_monitor);
+@@ -911,3 +908,4 @@ void ath9k_hw_ani_init(struct ath_hw *ah
+       ath9k_ani_restart(ah);
+       ath9k_enable_mib_counters(ah);
+ }
++EXPORT_SYMBOL(ath9k_hw_ani_init);
+--- a/drivers/net/wireless/ath/ath9k/ani.h
++++ b/drivers/net/wireless/ath/ath9k/ani.h
+@@ -25,11 +25,13 @@
+ 
+ /* units are errors per second */
+ #define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
+-#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      1000
++#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      3500
++#define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
+ 
+ /* units are errors per second */
+ #define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
+ #define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
++#define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
+ 
+ /* units are errors per second */
+ #define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
+@@ -53,7 +55,7 @@
+ #define ATH9K_ANI_RSSI_THR_LOW            7
+ 
+ #define ATH9K_ANI_PERIOD_OLD              100
+-#define ATH9K_ANI_PERIOD_NEW              1000
++#define ATH9K_ANI_PERIOD_NEW              300
+ 
+ /* in ms */
+ #define ATH9K_ANI_POLLINTERVAL_OLD        100
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -1056,46 +1056,8 @@ static bool ar5008_hw_ani_control_old(st
+               break;
+       }
+       case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
+-              static const int m1ThreshLow[] = { 127, 50 };
+-              static const int m2ThreshLow[] = { 127, 40 };
+-              static const int m1Thresh[] = { 127, 0x4d };
+-              static const int m2Thresh[] = { 127, 0x40 };
+-              static const int m2CountThr[] = { 31, 16 };
+-              static const int m2CountThrLow[] = { 63, 48 };
+               u32 on = param ? 1 : 0;
+ 
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+-                            m1ThreshLow[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+-                            m2ThreshLow[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M1_THRESH,
+-                            m1Thresh[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M2_THRESH,
+-                            m2Thresh[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M2COUNT_THR,
+-                            m2CountThr[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+-                            m2CountThrLow[on]);
+-
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M1_THRESH_LOW,
+-                            m1ThreshLow[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M2_THRESH_LOW,
+-                            m2ThreshLow[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M1_THRESH,
+-                            m1Thresh[on]);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M2_THRESH,
+-                            m2Thresh[on]);
+-
+               if (on)
+                       REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+                                   AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -824,55 +824,6 @@ static bool ar9003_hw_ani_control(struct
+                * on == 0 means more noise imm
+                */
+               u32 on = param ? 1 : 0;
+-              /*
+-               * make register setting for default
+-               * (weak sig detect ON) come from INI file
+-               */
+-              int m1ThreshLow = on ?
+-                      aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+-              int m2ThreshLow = on ?
+-                      aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+-              int m1Thresh = on ?
+-                      aniState->iniDef.m1Thresh : m1Thresh_off;
+-              int m2Thresh = on ?
+-                      aniState->iniDef.m2Thresh : m2Thresh_off;
+-              int m2CountThr = on ?
+-                      aniState->iniDef.m2CountThr : m2CountThr_off;
+-              int m2CountThrLow = on ?
+-                      aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+-              int m1ThreshLowExt = on ?
+-                      aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+-              int m2ThreshLowExt = on ?
+-                      aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+-              int m1ThreshExt = on ?
+-                      aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+-              int m2ThreshExt = on ?
+-                      aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
+-
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+-                            m1ThreshLow);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+-                            m2ThreshLow);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M1_THRESH, m1Thresh);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M2_THRESH, m2Thresh);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-                            AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-                            AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+-                            m2CountThrLow);
+-
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
+-              REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-                            AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
+ 
+               if (on)
+                       REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -430,10 +430,14 @@ void rt2x00lib_txdone(struct queue_entry
+       /*
+        * If the data queue was below the threshold before the txdone
+        * handler we must make sure the packet queue in the mac80211 stack
+-       * is reenabled when the txdone handler has finished.
++       * is reenabled when the txdone handler has finished. This has to be
++       * serialized with rt2x00mac_tx(), otherwise we can wake up queue
++       * before it was stopped.
+        */
++      spin_lock_bh(&entry->queue->tx_lock);
+       if (!rt2x00queue_threshold(entry->queue))
+               rt2x00queue_unpause_queue(entry->queue);
++      spin_unlock_bh(&entry->queue->tx_lock);
+ }
+ EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
+ 
+--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
+@@ -152,13 +152,22 @@ void rt2x00mac_tx(struct ieee80211_hw *h
+       if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
+               goto exit_fail;
+ 
++      /*
++       * Pausing queue has to be serialized with rt2x00lib_txdone(). Note
++       * we should not use spin_lock_bh variant as bottom halve was already
++       * disabled before ieee80211_xmit() call.
++       */
++      spin_lock(&queue->tx_lock);
+       if (rt2x00queue_threshold(queue))
+               rt2x00queue_pause_queue(queue);
++      spin_unlock(&queue->tx_lock);
+ 
+       return;
+ 
+  exit_fail:
++      spin_lock(&queue->tx_lock);
+       rt2x00queue_pause_queue(queue);
++      spin_unlock(&queue->tx_lock);
+  exit_free_skb:
+       ieee80211_free_txskb(hw, skb);
+ }
+--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
++++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
+@@ -619,6 +619,9 @@ int rt2x00queue_write_tx_frame(struct da
+       else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags))
+               rt2x00queue_align_frame(skb);
+ 
++      /*
++       * That function must be called with bh disabled.
++       */
+       spin_lock(&queue->tx_lock);

  
  

+       if (unlikely(rt2x00queue_full(queue))) {