+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -234,6 +234,7 @@ struct ath_buf {
+ dma_addr_t bf_daddr; /* physical addr of desc */
+ dma_addr_t bf_buf_addr; /* physical addr of data buffer, for DMA */
+ bool bf_stale;
++ struct ieee80211_tx_rate rates[4];
+ struct ath_buf_state bf_state;
+ };
+
+@@ -250,9 +251,9 @@ struct ath_atx_tid {
+ int tidno;
+ int baw_head; /* first un-acked tx buffer */
+ int baw_tail; /* next unused tx buffer slot */
+- int sched;
+- int paused;
+- u8 state;
++ bool sched;
++ bool paused;
++ bool active;
+ };
+
+ struct ath_node {
+@@ -273,10 +274,6 @@ struct ath_node {
+ #endif
+ };
+
+-#define AGGR_CLEANUP BIT(1)
+-#define AGGR_ADDBA_COMPLETE BIT(2)
+-#define AGGR_ADDBA_PROGRESS BIT(3)
+-
+ struct ath_tx_control {
+ struct ath_txq *txq;
+ struct ath_node *an;
+@@ -658,11 +655,10 @@ enum sc_op_flags {
+ struct ath_rate_table;
+
+ struct ath9k_vif_iter_data {
+- const u8 *hw_macaddr; /* phy's hardware address, set
+- * before starting iteration for
+- * valid bssid mask.
+- */
++ u8 hw_macaddr[ETH_ALEN]; /* address of the first vif */
+ u8 mask[ETH_ALEN]; /* bssid mask */
++ bool has_hw_macaddr;
++
+ int naps; /* number of AP vifs */
+ int nmeshes; /* number of mesh vifs */
+ int nstations; /* number of station vifs */
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1171,6 +1171,7 @@ u32 ath9k_regd_get_ctl(struct ath_regula
+ static inline void ath9k_hw_set_dma(struct ath_hw *ah)
+ {
+ struct ath_common *common = ath9k_hw_common(ah);
++ int txbuf_size;
+
+ ENABLE_REGWRITE_BUFFER(ah);
+
+@@ -1224,13 +1225,17 @@ static inline void ath9k_hw_set_dma(stru
+ * So set the usable tx buf size also to half to
+ * avoid data/delimiter underruns
+ */
+- REG_WRITE(ah, AR_PCU_TXBUF_CTRL,
+- AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE);
+- } else if (!AR_SREV_9271(ah)) {
+- REG_WRITE(ah, AR_PCU_TXBUF_CTRL,
+- AR_PCU_TXBUF_CTRL_USABLE_SIZE);
++ txbuf_size = AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE;
++ } else if (AR_SREV_9340_13_OR_LATER(ah)) {
++ /* Uses fewer entries for AR934x v1.3+ to prevent rx overruns */
++ txbuf_size = AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE;
++ } else {
++ txbuf_size = AR_PCU_TXBUF_CTRL_USABLE_SIZE;
+ }
+
++ if (!AR_SREV_9271(ah))
++ REG_WRITE(ah, AR_PCU_TXBUF_CTRL, txbuf_size);
++
+ REGWRITE_BUFFER_FLUSH(ah);
+
+ if (AR_SREV_9300_20_OR_LATER(ah))
+@@ -1305,9 +1310,13 @@ static bool ath9k_hw_set_reset(struct at
+ AR_RTC_RC_COLD_RESET | AR_RTC_RC_WARM_RESET;
+ } else {
+ tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE);
+- if (tmpReg &
+- (AR_INTR_SYNC_LOCAL_TIMEOUT |
+- AR_INTR_SYNC_RADM_CPL_TIMEOUT)) {
++ if (AR_SREV_9340(ah))
++ tmpReg &= AR9340_INTR_SYNC_LOCAL_TIMEOUT;
++ else
++ tmpReg &= AR_INTR_SYNC_LOCAL_TIMEOUT |
++ AR_INTR_SYNC_RADM_CPL_TIMEOUT;
++
++ if (tmpReg) {
+ u32 val;
+ REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);
+
+@@ -1366,7 +1375,10 @@ static bool ath9k_hw_set_reset(struct at
+
+ REGWRITE_BUFFER_FLUSH(ah);
+
+- udelay(50);
++ if (AR_SREV_9100(ah))
++ mdelay(10);
++ else
++ udelay(50);
+
+ REG_WRITE(ah, AR_RTC_RC, 0);
+ if (!ath9k_hw_wait(ah, AR_RTC_RC, AR_RTC_RC_M, 0, AH_WAIT_TIMEOUT)) {
+@@ -1377,8 +1389,12 @@ static bool ath9k_hw_set_reset(struct at
+ if (!AR_SREV_9100(ah))
+ REG_WRITE(ah, AR_RC, 0);
+
+- if (AR_SREV_9100(ah))
++ if (AR_SREV_9100(ah) && type != ATH9K_RESET_WARM) {
++ if (ah->external_reset)
++ ah->external_reset();
++
+ udelay(50);
++ }
+
+ return true;
+ }
+@@ -1464,7 +1480,8 @@ static bool ath9k_hw_chip_reset(struct a
+ reset_type = ATH9K_RESET_POWER_ON;
+ else
+ reset_type = ATH9K_RESET_COLD;
+- } else if (ah->chip_fullsleep || REG_READ(ah, AR_Q_TXE) ||
++ } else if (ah->chip_fullsleep ||
++ REG_READ(ah, AR_Q_TXE) ||
+ (REG_READ(ah, AR_CR) & AR_CR_RXE))
+ reset_type = ATH9K_RESET_COLD;
+
+@@ -1698,12 +1715,11 @@ static void ath9k_hw_reset_opmode(struct
+
+ ENABLE_REGWRITE_BUFFER(ah);
+
+- REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
+- REG_WRITE(ah, AR_STA_ID1, get_unaligned_le16(common->macaddr + 4)
+- | macStaId1
++ REG_RMW(ah, AR_STA_ID1, macStaId1
+ | AR_STA_ID1_RTS_USE_DEF
+ | (ah->config.ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)
+- | ah->sta_id1_defaults);
++ | ah->sta_id1_defaults,
++ ~AR_STA_ID1_SADH_MASK);
+ ath_hw_setbssidmask(common);
+ REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
+ ath9k_hw_write_associd(ah);
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -839,10 +839,14 @@ static void ath9k_vif_iter(void *data, u
+ struct ath9k_vif_iter_data *iter_data = data;
+ int i;
+
+- if (iter_data->hw_macaddr)
++ if (iter_data->has_hw_macaddr) {
+ for (i = 0; i < ETH_ALEN; i++)
+ iter_data->mask[i] &=
+ ~(iter_data->hw_macaddr[i] ^ mac[i]);
++ } else {
++ memcpy(iter_data->hw_macaddr, mac, ETH_ALEN);
++ iter_data->has_hw_macaddr = true;
++ }
+
+ switch (vif->type) {
+ case NL80211_IFTYPE_AP:
+@@ -891,7 +895,6 @@ void ath9k_calculate_iter_data(struct ie
+ * together with the BSSID mask when matching addresses.
+ */
+ memset(iter_data, 0, sizeof(*iter_data));
+- iter_data->hw_macaddr = common->macaddr;
+ memset(&iter_data->mask, 0xff, ETH_ALEN);
+
+ if (vif)
+@@ -901,6 +904,8 @@ void ath9k_calculate_iter_data(struct ie
+ ieee80211_iterate_active_interfaces_atomic(
+ sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+ ath9k_vif_iter, iter_data);
++
++ memcpy(common->macaddr, iter_data->hw_macaddr, ETH_ALEN);
+ }
+
+ /* Called with sc->mutex held. */
+@@ -1327,6 +1332,7 @@ static int ath9k_sta_add(struct ieee8021
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_node *an = (struct ath_node *) sta->drv_priv;
+ struct ieee80211_key_conf ps_key = { };
++ int key;
+
+ ath_node_attach(sc, sta, vif);
+
+@@ -1334,7 +1340,9 @@ static int ath9k_sta_add(struct ieee8021
+ vif->type != NL80211_IFTYPE_AP_VLAN)
+ return 0;
+
+- an->ps_key = ath_key_config(common, vif, sta, &ps_key);
++ key = ath_key_config(common, vif, sta, &ps_key);
++ if (key > 0)
++ an->ps_key = key;
+
+ return 0;
+ }
+@@ -1351,6 +1359,7 @@ static void ath9k_del_ps_key(struct ath_
+ return;
+
+ ath_key_delete(common, &ps_key);
++ an->ps_key = 0;
+ }
+
+ static int ath9k_sta_remove(struct ieee80211_hw *hw,
+@@ -1678,6 +1687,7 @@ static int ath9k_ampdu_action(struct iee
+ u16 tid, u16 *ssn, u8 buf_size)
+ {
+ struct ath_softc *sc = hw->priv;
++ bool flush = false;
+ int ret = 0;
+
+ local_bh_disable();
+@@ -1694,12 +1704,14 @@ static int ath9k_ampdu_action(struct iee
+ ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+ ath9k_ps_restore(sc);
+ break;
+- case IEEE80211_AMPDU_TX_STOP_CONT:
+ case IEEE80211_AMPDU_TX_STOP_FLUSH:
+ case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
++ flush = true;
++ case IEEE80211_AMPDU_TX_STOP_CONT:
+ ath9k_ps_wakeup(sc);
+ ath_tx_aggr_stop(sc, sta, tid);
+- ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
++ if (!flush)
++ ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+ ath9k_ps_restore(sc);
+ break;
+ case IEEE80211_AMPDU_TX_OPERATIONAL:
+--- a/drivers/net/wireless/ath/ath9k/reg.h
++++ b/drivers/net/wireless/ath/ath9k/reg.h
+@@ -798,6 +798,10 @@
+ #define AR_SREV_REVISION_9485_10 0
+ #define AR_SREV_REVISION_9485_11 1
+ #define AR_SREV_VERSION_9340 0x300
++#define AR_SREV_REVISION_9340_10 0
++#define AR_SREV_REVISION_9340_11 1
++#define AR_SREV_REVISION_9340_12 2
++#define AR_SREV_REVISION_9340_13 3
+ #define AR_SREV_VERSION_9580 0x1C0
+ #define AR_SREV_REVISION_9580_10 4 /* AR9580 1.0 */
+ #define AR_SREV_VERSION_9462 0x280
+@@ -897,6 +901,10 @@
+ #define AR_SREV_9340(_ah) \
+ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9340))
+
++#define AR_SREV_9340_13_OR_LATER(_ah) \
++ (AR_SREV_9340((_ah)) && \
++ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9340_13))
++
+ #define AR_SREV_9285E_20(_ah) \
+ (AR_SREV_9285_12_OR_LATER(_ah) && \
+ ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
+@@ -1007,6 +1015,8 @@ enum {
+ AR_INTR_SYNC_LOCAL_TIMEOUT |
+ AR_INTR_SYNC_MAC_SLEEP_ACCESS),
+
++ AR9340_INTR_SYNC_LOCAL_TIMEOUT = 0x00000010,
++
+ AR_INTR_SYNC_SPURIOUS = 0xFFFFFFFF,
+
+ };
+@@ -1493,9 +1503,6 @@ enum {
+ #define AR9271_RADIO_RF_RST 0x20
+ #define AR9271_GATE_MAC_CTL 0x4000
+
+-#define AR_STA_ID0 0x8000
+-#define AR_STA_ID1 0x8004
+-#define AR_STA_ID1_SADH_MASK 0x0000FFFF
+ #define AR_STA_ID1_STA_AP 0x00010000
+ #define AR_STA_ID1_ADHOC 0x00020000
+ #define AR_STA_ID1_PWR_SAV 0x00040000
+@@ -1884,6 +1891,7 @@ enum {
+ #define AR_PCU_TXBUF_CTRL_SIZE_MASK 0x7FF
+ #define AR_PCU_TXBUF_CTRL_USABLE_SIZE 0x700
+ #define AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE 0x380
++#define AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE 0x500
+
+ #define AR_PCU_MISC_MODE2 0x8344
+ #define AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE 0x00000002
+--- a/drivers/net/wireless/ath/hw.c
++++ b/drivers/net/wireless/ath/hw.c
+@@ -118,6 +118,12 @@
+ void ath_hw_setbssidmask(struct ath_common *common)
+ {
+ void *ah = common->ah;
++ u32 id1;
++
++ REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
++ id1 = REG_READ(ah, AR_STA_ID1) & ~AR_STA_ID1_SADH_MASK;
++ id1 |= get_unaligned_le16(common->macaddr + 4);
++ REG_WRITE(ah, AR_STA_ID1, id1);
+
+ REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(common->bssidmask));
+ REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(common->bssidmask + 4));
+--- a/drivers/net/wireless/ath/reg.h
++++ b/drivers/net/wireless/ath/reg.h
+@@ -23,6 +23,10 @@
+ #define AR_MIBC_CMC 0x00000004
+ #define AR_MIBC_MCS 0x00000008
+
++#define AR_STA_ID0 0x8000
++#define AR_STA_ID1 0x8004
++#define AR_STA_ID1_SADH_MASK 0x0000ffff
++
+ /*
+ * BSSID mask registers. See ath_hw_set_bssid_mask()
+ * for detailed documentation about these registers.
+--- a/drivers/net/wireless/iwlegacy/4965-mac.c
++++ b/drivers/net/wireless/iwlegacy/4965-mac.c
+@@ -6059,7 +6059,7 @@ il4965_mac_channel_switch(struct ieee802
+ struct il_priv *il = hw->priv;
+ const struct il_channel_info *ch_info;
+ struct ieee80211_conf *conf = &hw->conf;
+- struct ieee80211_channel *channel = ch_switch->channel;
++ struct ieee80211_channel *channel = ch_switch->chandef.chan;
+ struct il_ht_config *ht_conf = &il->current_ht_config;
+ u16 ch;
+
+@@ -6096,23 +6096,21 @@ il4965_mac_channel_switch(struct ieee802
+ il->current_ht_config.smps = conf->smps_mode;
+
+ /* Configure HT40 channels */
+- il->ht.enabled = conf_is_ht(conf);
+- if (il->ht.enabled) {
+- if (conf_is_ht40_minus(conf)) {
+- il->ht.extension_chan_offset =
+- IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+- il->ht.is_40mhz = true;
+- } else if (conf_is_ht40_plus(conf)) {
+- il->ht.extension_chan_offset =
+- IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+- il->ht.is_40mhz = true;
+- } else {
+- il->ht.extension_chan_offset =
+- IEEE80211_HT_PARAM_CHA_SEC_NONE;
+- il->ht.is_40mhz = false;
+- }
+- } else
++ switch (cfg80211_get_chandef_type(&ch_switch->chandef)) {
++ case NL80211_CHAN_NO_HT:
++ case NL80211_CHAN_HT20:
+ il->ht.is_40mhz = false;
++ il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
++ break;
++ case NL80211_CHAN_HT40MINUS:
++ il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
++ il->ht.is_40mhz = true;
++ break;
++ case NL80211_CHAN_HT40PLUS:
++ il->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
++ il->ht.is_40mhz = true;
++ break;
++ }
+
+ if ((le16_to_cpu(il->staging.channel) != ch))
+ il->staging.flags = 0;
+--- a/drivers/net/wireless/iwlegacy/4965.c
++++ b/drivers/net/wireless/iwlegacy/4965.c
+@@ -1493,7 +1493,7 @@ il4965_hw_channel_switch(struct il_priv
+
+ cmd.band = band;
+ cmd.expect_beacon = 0;
+- ch = ch_switch->channel->hw_value;
++ ch = ch_switch->chandef.chan->hw_value;
+ cmd.channel = cpu_to_le16(ch);
+ cmd.rxon_flags = il->staging.flags;
+ cmd.rxon_filter_flags = il->staging.filter_flags;
+--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
++++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
+@@ -379,7 +379,7 @@ static int iwl5000_hw_channel_switch(str
+ };
+
+ cmd.band = priv->band == IEEE80211_BAND_2GHZ;
+- ch = ch_switch->channel->hw_value;
++ ch = ch_switch->chandef.chan->hw_value;
+ IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
+ ctx->active.channel, ch);
+ cmd.channel = cpu_to_le16(ch);
+@@ -414,7 +414,8 @@ static int iwl5000_hw_channel_switch(str
+ }
+ IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
+ cmd.switch_time);
+- cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
++ cmd.expect_beacon =
++ ch_switch->chandef.chan->flags & IEEE80211_CHAN_RADAR;
+
+ return iwl_dvm_send_cmd(priv, &hcmd);
+ }
+@@ -540,7 +541,7 @@ static int iwl6000_hw_channel_switch(str
+ hcmd.data[0] = cmd;
+
+ cmd->band = priv->band == IEEE80211_BAND_2GHZ;
+- ch = ch_switch->channel->hw_value;
++ ch = ch_switch->chandef.chan->hw_value;
+ IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
+ ctx->active.channel, ch);
+ cmd->channel = cpu_to_le16(ch);
+@@ -575,7 +576,8 @@ static int iwl6000_hw_channel_switch(str
+ }
+ IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
+ cmd->switch_time);
+- cmd->expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
++ cmd->expect_beacon =
++ ch_switch->chandef.chan->flags & IEEE80211_CHAN_RADAR;
+
+ err = iwl_dvm_send_cmd(priv, &hcmd);
+ kfree(cmd);
+--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
++++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+@@ -970,7 +970,7 @@ static void iwlagn_mac_channel_switch(st
+ {
+ struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+ struct ieee80211_conf *conf = &hw->conf;
+- struct ieee80211_channel *channel = ch_switch->channel;
++ struct ieee80211_channel *channel = ch_switch->chandef.chan;
+ struct iwl_ht_config *ht_conf = &priv->current_ht_config;
+ /*
+ * MULTI-FIXME
+@@ -1008,11 +1008,21 @@ static void iwlagn_mac_channel_switch(st
+ priv->current_ht_config.smps = conf->smps_mode;
+
+ /* Configure HT40 channels */
+- ctx->ht.enabled = conf_is_ht(conf);
+- if (ctx->ht.enabled)
+- iwlagn_config_ht40(conf, ctx);
+- else
++ switch (cfg80211_get_chandef_type(&ch_switch->chandef)) {
++ case NL80211_CHAN_NO_HT:
++ case NL80211_CHAN_HT20:
+ ctx->ht.is_40mhz = false;
++ ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
++ break;
++ case NL80211_CHAN_HT40MINUS:
++ ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
++ ctx->ht.is_40mhz = true;
++ break;
++ case NL80211_CHAN_HT40PLUS:
++ ctx->ht.extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
++ ctx->ht.is_40mhz = true;
++ break;
++ }
+
+ if ((le16_to_cpu(ctx->staging.channel) != ch))
+ ctx->staging.flags = 0;
+--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
++++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
+@@ -1160,7 +1160,7 @@ int iwlagn_commit_rxon(struct iwl_priv *
+ }
+
+ void iwlagn_config_ht40(struct ieee80211_conf *conf,
+- struct iwl_rxon_context *ctx)
++ struct iwl_rxon_context *ctx)
+ {
+ if (conf_is_ht40_minus(conf)) {
+ ctx->ht.extension_chan_offset =
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -25,6 +25,7 @@
+ #include <linux/if_arp.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/etherdevice.h>
++#include <linux/platform_device.h>
+ #include <linux/debugfs.h>
+ #include <linux/module.h>
+ #include <linux/ktime.h>
+@@ -717,9 +718,17 @@ static bool mac80211_hwsim_tx_frame_no_n
+ rx_status.flag |= RX_FLAG_MACTIME_START;
+ rx_status.freq = chan->center_freq;
+ rx_status.band = chan->band;
+- rx_status.rate_idx = info->control.rates[0].idx;
+- if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
+- rx_status.flag |= RX_FLAG_HT;
++ if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {
++ rx_status.rate_idx =
++ ieee80211_rate_get_vht_mcs(&info->control.rates[0]);
++ rx_status.vht_nss =
++ ieee80211_rate_get_vht_nss(&info->control.rates[0]);
++ rx_status.flag |= RX_FLAG_VHT;
++ } else {
++ rx_status.rate_idx = info->control.rates[0].idx;
++ if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
++ rx_status.flag |= RX_FLAG_HT;
++ }
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+ rx_status.flag |= RX_FLAG_40MHZ;
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)
+@@ -1687,6 +1696,7 @@ static void mac80211_hwsim_free(void)
+ debugfs_remove(data->debugfs_ps);
+ debugfs_remove(data->debugfs);
+ ieee80211_unregister_hw(data->hw);
++ device_release_driver(data->dev);
+ device_unregister(data->dev);
+ ieee80211_free_hw(data->hw);
+ }
+@@ -1695,7 +1705,9 @@ static void mac80211_hwsim_free(void)
+
+
+ static struct device_driver mac80211_hwsim_driver = {
+- .name = "mac80211_hwsim"
++ .name = "mac80211_hwsim",
++ .bus = &platform_bus_type,
++ .owner = THIS_MODULE,
+ };
+
+ static const struct net_device_ops hwsim_netdev_ops = {
+@@ -2187,9 +2199,15 @@ static int __init init_mac80211_hwsim(vo
+ spin_lock_init(&hwsim_radio_lock);
+ INIT_LIST_HEAD(&hwsim_radios);
+
++ err = driver_register(&mac80211_hwsim_driver);
++ if (err)
++ return err;
++
+ hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
+- if (IS_ERR(hwsim_class))
+- return PTR_ERR(hwsim_class);
++ if (IS_ERR(hwsim_class)) {
++ err = PTR_ERR(hwsim_class);
++ goto failed_unregister_driver;
++ }
+
+ memset(addr, 0, ETH_ALEN);
+ addr[0] = 0x02;
+@@ -2211,12 +2229,20 @@ static int __init init_mac80211_hwsim(vo
+ "hwsim%d", i);
+ if (IS_ERR(data->dev)) {
+ printk(KERN_DEBUG
+- "mac80211_hwsim: device_create "
+- "failed (%ld)\n", PTR_ERR(data->dev));
++ "mac80211_hwsim: device_create failed (%ld)\n",
++ PTR_ERR(data->dev));
+ err = -ENOMEM;
+ goto failed_drvdata;
+ }
+ data->dev->driver = &mac80211_hwsim_driver;
++ err = device_bind_driver(data->dev);
++ if (err != 0) {
++ printk(KERN_DEBUG
++ "mac80211_hwsim: device_bind_driver failed (%d)\n",
++ err);
++ goto failed_hw;
++ }
++
+ skb_queue_head_init(&data->pending);
+
+ SET_IEEE80211_DEV(hw, data->dev);
+@@ -2515,6 +2541,8 @@ failed_drvdata:
+ ieee80211_free_hw(hw);
+ failed:
+ mac80211_hwsim_free();
++failed_unregister_driver:
++ driver_unregister(&mac80211_hwsim_driver);
+ return err;
+ }
+ module_init(init_mac80211_hwsim);
+@@ -2527,5 +2555,6 @@ static void __exit exit_mac80211_hwsim(v
+
+ mac80211_hwsim_free();
+ unregister_netdev(hwsim_mon);
++ driver_unregister(&mac80211_hwsim_driver);
+ }
+ module_exit(exit_mac80211_hwsim);
+--- a/drivers/net/wireless/ti/wl12xx/cmd.c
++++ b/drivers/net/wireless/ti/wl12xx/cmd.c
+@@ -301,7 +301,7 @@ int wl12xx_cmd_channel_switch(struct wl1
+ }
+
+ cmd->role_id = wlvif->role_id;
+- cmd->channel = ch_switch->channel->hw_value;
++ cmd->channel = ch_switch->chandef.chan->hw_value;
+ cmd->switch_time = ch_switch->count;
+ cmd->stop_tx = ch_switch->block_tx;
+
+--- a/drivers/net/wireless/ti/wl18xx/cmd.c
++++ b/drivers/net/wireless/ti/wl18xx/cmd.c
+@@ -42,11 +42,11 @@ int wl18xx_cmd_channel_switch(struct wl1
+ }
+
+ cmd->role_id = wlvif->role_id;
+- cmd->channel = ch_switch->channel->hw_value;
++ cmd->channel = ch_switch->chandef.chan->hw_value;
+ cmd->switch_time = ch_switch->count;
+ cmd->stop_tx = ch_switch->block_tx;
+
+- switch (ch_switch->channel->band) {
++ switch (ch_switch->chandef.chan->band) {
+ case IEEE80211_BAND_2GHZ:
+ cmd->band = WLCORE_BAND_2_4GHZ;
+ break;
+@@ -55,7 +55,7 @@ int wl18xx_cmd_channel_switch(struct wl1
+ break;
+ default:
+ wl1271_error("invalid channel switch band: %d",
+- ch_switch->channel->band);
++ ch_switch->chandef.chan->band);
+ ret = -EINVAL;
+ goto out_free;
+ }
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
+@@ -673,6 +673,36 @@ struct ieee80211_channel_sw_ie {
+ } __packed;
+
+ /**
++ * struct ieee80211_ext_chansw_ie
++ *
++ * This structure represents the "Extended Channel Switch Announcement element"
++ */
++struct ieee80211_ext_chansw_ie {
++ u8 mode;
++ u8 new_operating_class;
++ u8 new_ch_num;
++ u8 count;
++} __packed;
++
++/**
++ * struct ieee80211_sec_chan_offs_ie - secondary channel offset IE
++ * @sec_chan_offs: secondary channel offset, uses IEEE80211_HT_PARAM_CHA_SEC_*
++ * values here
++ * This structure represents the "Secondary Channel Offset element"
++ */
++struct ieee80211_sec_chan_offs_ie {
++ u8 sec_chan_offs;
++} __packed;
++
++/**
++ * struct ieee80211_wide_bw_chansw_ie - wide bandwidth channel switch IE
++ */
++struct ieee80211_wide_bw_chansw_ie {
++ u8 new_channel_width;
++ u8 new_center_freq_seg0, new_center_freq_seg1;
++} __packed;
++
++/**
+ * struct ieee80211_tim
+ *
+ * This structure refers to "Traffic Indication Map information element"
+@@ -840,12 +870,15 @@ struct ieee80211_mgmt {
+ } __packed wme_action;
+ struct{
+ u8 action_code;
+- u8 element_id;
+- u8 length;
+- struct ieee80211_channel_sw_ie sw_elem;
++ u8 variable[0];
+ } __packed chan_switch;
+ struct{
+ u8 action_code;
++ struct ieee80211_ext_chansw_ie data;
++ u8 variable[0];
++ } __packed ext_chan_switch;
++ struct{
++ u8 action_code;
+ u8 dialog_token;
+ u8 element_id;
+ u8 length;
+@@ -1638,6 +1671,7 @@ enum ieee80211_eid {
+
+ WLAN_EID_HT_CAPABILITY = 45,
+ WLAN_EID_HT_OPERATION = 61,
++ WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
+
+ WLAN_EID_RSN = 48,
+ WLAN_EID_MMIE = 76,
+@@ -1672,6 +1706,8 @@ enum ieee80211_eid {
+ WLAN_EID_VHT_CAPABILITY = 191,
+ WLAN_EID_VHT_OPERATION = 192,
+ WLAN_EID_OPMODE_NOTIF = 199,
++ WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
++ WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
+
+ /* 802.11ad */
+ WLAN_EID_NON_TX_BSSID_CAP = 83,
+@@ -1795,6 +1831,7 @@ enum ieee80211_key_len {
+
+ /* Public action codes */
+ enum ieee80211_pub_actioncode {
++ WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,
+ WLAN_PUB_ACTION_TDLS_DISCOVER_RES = 14,
+ };
+
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -753,6 +753,8 @@ int cfg80211_check_station_change(struct
+ * @STATION_INFO_LOCAL_PM: @local_pm filled
+ * @STATION_INFO_PEER_PM: @peer_pm filled
+ * @STATION_INFO_NONPEER_PM: @nonpeer_pm filled
++ * @STATION_INFO_CHAIN_SIGNAL: @chain_signal filled
++ * @STATION_INFO_CHAIN_SIGNAL_AVG: @chain_signal_avg filled
+ */
+ enum station_info_flags {
+ STATION_INFO_INACTIVE_TIME = 1<<0,
+@@ -781,6 +783,8 @@ enum station_info_flags {
+ STATION_INFO_NONPEER_PM = 1<<23,
+ STATION_INFO_RX_BYTES64 = 1<<24,
+ STATION_INFO_TX_BYTES64 = 1<<25,
++ STATION_INFO_CHAIN_SIGNAL = 1<<26,
++ STATION_INFO_CHAIN_SIGNAL_AVG = 1<<27,
+ };
+
+ /**
+@@ -857,6 +861,8 @@ struct sta_bss_parameters {
+ u16 beacon_interval;
+ };
+
++#define IEEE80211_MAX_CHAINS 4
++
+ /**
+ * struct station_info - station information
+ *
+@@ -874,6 +880,9 @@ struct sta_bss_parameters {
+ * For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
+ * For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
++ * @chains: bitmask for filled values in @chain_signal, @chain_signal_avg
++ * @chain_signal: per-chain signal strength of last received packet in dBm
++ * @chain_signal_avg: per-chain signal strength average in dBm
+ * @txrate: current unicast bitrate from this station
+ * @rxrate: current unicast bitrate to this station
+ * @rx_packets: packets received from this station
+@@ -909,6 +918,11 @@ struct station_info {
+ u8 plink_state;
+ s8 signal;
+ s8 signal_avg;
++
++ u8 chains;
++ s8 chain_signal[IEEE80211_MAX_CHAINS];
++ s8 chain_signal_avg[IEEE80211_MAX_CHAINS];
++
+ struct rate_info txrate;
+ struct rate_info rxrate;
+ u32 rx_packets;
+@@ -954,6 +968,7 @@ enum monitor_flags {
+ MONITOR_FLAG_CONTROL = 1<<NL80211_MNTR_FLAG_CONTROL,
+ MONITOR_FLAG_OTHER_BSS = 1<<NL80211_MNTR_FLAG_OTHER_BSS,
+ MONITOR_FLAG_COOK_FRAMES = 1<<NL80211_MNTR_FLAG_COOK_FRAMES,
++ MONITOR_FLAG_ACTIVE = 1<<NL80211_MNTR_FLAG_ACTIVE,
+ };
+
+ /**
+@@ -4027,6 +4042,17 @@ bool cfg80211_reg_can_beacon(struct wiph
+ void cfg80211_ch_switch_notify(struct net_device *dev,
+ struct cfg80211_chan_def *chandef);
+
++/**
++ * ieee80211_operating_class_to_band - convert operating class to band
++ *
++ * @operating_class: the operating class to convert
++ * @band: band pointer to fill
++ *
++ * Returns %true if the conversion was successful, %false otherwise.
++ */
++bool ieee80211_operating_class_to_band(u8 operating_class,
++ enum ieee80211_band *band);
++
+ /*
+ * cfg80211_tdls_oper_request - request userspace to perform TDLS operation
+ * @dev: the device on which the operation is requested
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -210,7 +210,7 @@ struct ieee80211_chanctx_conf {
+ * @BSS_CHANGED_QOS: QoS for this association was enabled/disabled. Note
+ * that it is only ever disabled for station mode.
+ * @BSS_CHANGED_IDLE: Idle changed for this BSS/interface.
+- * @BSS_CHANGED_SSID: SSID changed for this BSS (AP mode)
++ * @BSS_CHANGED_SSID: SSID changed for this BSS (AP and IBSS mode)
+ * @BSS_CHANGED_AP_PROBE_RESP: Probe Response changed for this BSS (AP mode)
+ * @BSS_CHANGED_PS: PS changed for this BSS (STA mode)
+ * @BSS_CHANGED_TXPOWER: TX power setting changed for this interface
+@@ -327,7 +327,7 @@ enum ieee80211_rssi_event {
+ * your driver/device needs to do.
+ * @ps: power-save mode (STA only). This flag is NOT affected by
+ * offchannel/dynamic_ps operations.
+- * @ssid: The SSID of the current vif. Only valid in AP-mode.
++ * @ssid: The SSID of the current vif. Valid in AP and IBSS mode.
+ * @ssid_len: Length of SSID given in @ssid.
+ * @hidden_ssid: The SSID of the current vif is hidden. Only valid in AP-mode.
+ * @txpower: TX power in dBm
+@@ -562,6 +562,9 @@ enum mac80211_rate_control_flags {
+ /* maximum number of rate stages */
+ #define IEEE80211_TX_MAX_RATES 4
+
++/* maximum number of rate table entries */
++#define IEEE80211_TX_RATE_TABLE_SIZE 4
++
+ /**
+ * struct ieee80211_tx_rate - rate selection/status
+ *
+@@ -602,8 +605,8 @@ static inline void ieee80211_rate_set_vh
+ u8 mcs, u8 nss)
+ {
+ WARN_ON(mcs & ~0xF);
+- WARN_ON(nss & ~0x7);
+- rate->idx = (nss << 4) | mcs;
++ WARN_ON((nss - 1) & ~0x7);
++ rate->idx = ((nss - 1) << 4) | mcs;
+ }
+
+ static inline u8
+@@ -615,7 +618,7 @@ ieee80211_rate_get_vht_mcs(const struct
+ static inline u8
+ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
+ {
+- return rate->idx >> 4;
++ return (rate->idx >> 4) + 1;
+ }
+
+ /**
+@@ -656,7 +659,11 @@ struct ieee80211_tx_info {
+ struct ieee80211_tx_rate rates[
+ IEEE80211_TX_MAX_RATES];
+ s8 rts_cts_rate_idx;
+- /* 3 bytes free */
++ u8 use_rts:1;
++ u8 use_cts_prot:1;
++ u8 short_preamble:1;
++ u8 skip_table:1;
++ /* 2 bytes free */
+ };
+ /* only needed before rate control */
+ unsigned long jiffies;
+@@ -677,6 +684,8 @@ struct ieee80211_tx_info {
+ struct {
+ struct ieee80211_tx_rate driver_rates[
+ IEEE80211_TX_MAX_RATES];
++ u8 pad[4];
++
+ void *rate_driver_data[
+ IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
+ };
+@@ -840,6 +849,9 @@ enum mac80211_rx_flags {
+ * @signal: signal strength when receiving this frame, either in dBm, in dB or
+ * unspecified depending on the hardware capabilities flags
+ * @IEEE80211_HW_SIGNAL_*
++ * @chains: bitmask of receive chains for which separate signal strength
++ * values were filled.
++ * @chain_signal: per-chain signal strength, same format as @signal
+ * @antenna: antenna used
+ * @rate_idx: index of data rate into band's supported rates or MCS index if
+ * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
+@@ -871,6 +883,8 @@ struct ieee80211_rx_status {
+ u8 band;
+ u8 antenna;
+ s8 signal;
++ u8 chains;
++ s8 chain_signal[IEEE80211_MAX_CHAINS];
+ u8 ampdu_delimiter_crc;
+ u8 vendor_radiotap_align;
+ u8 vendor_radiotap_oui[3];
+@@ -1018,13 +1032,13 @@ struct ieee80211_conf {
+ * the driver passed into mac80211.
+ * @block_tx: Indicates whether transmission must be blocked before the
+ * scheduled channel switch, as indicated by the AP.
+- * @channel: the new channel to switch to
++ * @chandef: the new channel to switch to
+ * @count: the number of TBTT's until the channel switch event
+ */
+ struct ieee80211_channel_switch {
+ u64 timestamp;
+ bool block_tx;
+- struct ieee80211_channel *channel;
++ struct cfg80211_chan_def chandef;
+ u8 count;
+ };
+
+@@ -1222,6 +1236,24 @@ enum ieee80211_sta_rx_bandwidth {
+ };
+
+ /**
++ * struct ieee80211_sta_rates - station rate selection table
++ *
++ * @rcu_head: RCU head used for freeing the table on update
++ * @rates: transmit rates/flags to be used by default.
++ * Overriding entries per-packet is possible by using cb tx control.
++ */
++struct ieee80211_sta_rates {
++ struct rcu_head rcu_head;
++ struct {
++ s8 idx;
++ u8 count;
++ u8 count_cts;
++ u8 count_rts;
++ u16 flags;
++ } rate[IEEE80211_TX_RATE_TABLE_SIZE];
++};
++
++/**
+ * struct ieee80211_sta - station table entry
+ *
+ * A station table entry represents a station we are possibly
+@@ -1248,6 +1280,7 @@ enum ieee80211_sta_rx_bandwidth {
+ * notifications and capabilities. The value is only valid after
+ * the station moves to associated state.
+ * @smps_mode: current SMPS mode (off, static or dynamic)
++ * @tx_rates: rate control selection table
+ */
+ struct ieee80211_sta {
+ u32 supp_rates[IEEE80211_NUM_BANDS];
+@@ -1261,6 +1294,7 @@ struct ieee80211_sta {
+ u8 rx_nss;
+ enum ieee80211_sta_rx_bandwidth bandwidth;
+ enum ieee80211_smps_mode smps_mode;
++ struct ieee80211_sta_rates __rcu *rates;
+
+ /* must be last */
+ u8 drv_priv[0] __aligned(sizeof(void *));
+@@ -1416,6 +1450,9 @@ struct ieee80211_tx_control {
+ * for different virtual interfaces. See the doc section on HW queue
+ * control for more details.
+ *
++ * @IEEE80211_HW_SUPPORTS_RC_TABLE: The driver supports using a rate
++ * selection table provided by the rate control algorithm.
++ *
+ * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any
+ * P2P Interface. This will be honoured even if more than one interface
+ * is supported.
+@@ -1448,6 +1485,7 @@ enum ieee80211_hw_flags {
+ IEEE80211_HW_SUPPORTS_PER_STA_GTK = 1<<21,
+ IEEE80211_HW_AP_LINK_PS = 1<<22,
+ IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23,
++ IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24,
+ IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
+ IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26,
+ };
+@@ -3144,6 +3182,25 @@ void ieee80211_sta_set_buffered(struct i
+ u8 tid, bool buffered);
+
+ /**
++ * ieee80211_get_tx_rates - get the selected transmit rates for a packet
++ *
++ * Call this function in a driver with per-packet rate selection support
++ * to combine the rate info in the packet tx info with the most recent
++ * rate selection table for the station entry.
++ *
++ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
++ * @sta: the receiver station to which this packet is sent.
++ * @skb: the frame to be transmitted.
++ * @dest: buffer for extracted rate/retry information
++ * @max_rates: maximum number of rates to fetch
++ */
++void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
++ struct ieee80211_sta *sta,
++ struct sk_buff *skb,
++ struct ieee80211_tx_rate *dest,
++ int max_rates);
++
++/**
+ * ieee80211_tx_status - transmit status callback
+ *
+ * Call this function for all transmitted frames after they have been
+@@ -4118,7 +4175,7 @@ void ieee80211_send_bar(struct ieee80211
+ * (deprecated; this will be removed once drivers get updated to use
+ * rate_idx_mask)
+ * @rate_idx_mask: user-requested (legacy) rate mask
+- * @rate_idx_mcs_mask: user-requested MCS rate mask
++ * @rate_idx_mcs_mask: user-requested MCS rate mask (NULL if not in use)
+ * @bss: whether this frame is sent out in AP or IBSS mode
+ */
+ struct ieee80211_tx_rate_control {
+@@ -4130,7 +4187,7 @@ struct ieee80211_tx_rate_control {
+ bool rts, short_preamble;
+ u8 max_rate_idx;
+ u32 rate_idx_mask;
+- u8 rate_idx_mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
++ u8 *rate_idx_mcs_mask;
+ bool bss;
+ };
+
+@@ -4219,6 +4276,22 @@ bool rate_usable_index_exists(struct iee
+ return false;
+ }
+
++/**
++ * rate_control_set_rates - pass the sta rate selection to mac80211/driver
++ *
++ * When not doing a rate control probe to test rates, rate control should pass
++ * its rate selection to mac80211. If the driver supports receiving a station
++ * rate table, it will use it to ensure that frames are always sent based on
++ * the most recent rate control module decision.
++ *
++ * @hw: pointer as obtained from ieee80211_alloc_hw()
++ * @pubsta: &struct ieee80211_sta pointer to the target destination.
++ * @rates: new tx rate set to be used for this station.
++ */
++int rate_control_set_rates(struct ieee80211_hw *hw,
++ struct ieee80211_sta *pubsta,
++ struct ieee80211_sta_rates *rates);
++
+ int ieee80211_rate_control_register(struct rate_control_ops *ops);
+ void ieee80211_rate_control_unregister(struct rate_control_ops *ops);
+
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
-@@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
+@@ -204,6 +204,8 @@ static void ieee80211_send_addba_resp(st
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);
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);
-@@ -520,6 +521,7 @@ int ieee80211_start_tx_ba_session(struct
+@@ -527,6 +528,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 &&
sdata->vif.type != NL80211_IFTYPE_ADHOC)
return -EINVAL;
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -73,16 +73,19 @@ static int ieee80211_change_iface(struct
+ struct ieee80211_local *local = sdata->local;
+
+ if (ieee80211_sdata_running(sdata)) {
++ u32 mask = MONITOR_FLAG_COOK_FRAMES |
++ MONITOR_FLAG_ACTIVE;
++
+ /*
+- * Prohibit MONITOR_FLAG_COOK_FRAMES to be
+- * changed while the interface is up.
++ * Prohibit MONITOR_FLAG_COOK_FRAMES and
++ * MONITOR_FLAG_ACTIVE to be changed while the
++ * interface is up.
+ * Else we would need to add a lot of cruft
+ * to update everything:
+ * cooked_mntrs, monitor and all fif_* counters
+ * reconfigure hardware
+ */
+- if ((*flags & MONITOR_FLAG_COOK_FRAMES) !=
+- (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))
++ if ((*flags & mask) != (sdata->u.mntr_flags & mask))
+ return -EBUSY;
+
+ ieee80211_adjust_monitor_flags(sdata, -1);
+@@ -444,7 +447,7 @@ static void sta_set_sinfo(struct sta_inf
+ struct ieee80211_local *local = sdata->local;
+ struct timespec uptime;
+ u64 packets = 0;
+- int ac;
++ int i, ac;
+
+ sinfo->generation = sdata->local->sta_generation;
+
+@@ -488,6 +491,17 @@ static void sta_set_sinfo(struct sta_inf
+ sinfo->signal = (s8)sta->last_signal;
+ sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
+ }
++ if (sta->chains) {
++ sinfo->filled |= STATION_INFO_CHAIN_SIGNAL |
++ STATION_INFO_CHAIN_SIGNAL_AVG;
++
++ sinfo->chains = sta->chains;
++ for (i = 0; i < ARRAY_SIZE(sinfo->chain_signal); i++) {
++ sinfo->chain_signal[i] = sta->chain_signal_last[i];
++ sinfo->chain_signal_avg[i] =
++ (s8) -ewma_read(&sta->chain_signal_avg[i]);
++ }
++ }
+
+ sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate);
+ sta_set_rate_info_rx(sta, &sinfo->rxrate);
+@@ -1052,6 +1066,7 @@ static int ieee80211_stop_ap(struct wiph
+ ieee80211_free_keys(sdata);
+
+ sdata->vif.bss_conf.enable_beacon = false;
++ sdata->vif.bss_conf.ssid_len = 0;
+ clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
+ ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
+
+@@ -2416,9 +2431,22 @@ static int ieee80211_set_bitrate_mask(st
+ }
+
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
++ struct ieee80211_supported_band *sband = wiphy->bands[i];
++ int j;
++
+ sdata->rc_rateidx_mask[i] = mask->control[i].legacy;
+ memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,
+ sizeof(mask->control[i].mcs));
++
++ sdata->rc_has_mcs_mask[i] = false;
++ if (!sband)
++ continue;
++
++ for (j = 0; j < IEEE80211_HT_MCS_MASK_LEN; j++)
++ if (~sdata->rc_rateidx_mcs_mask[i][j]) {
++ sdata->rc_has_mcs_mask[i] = true;
++ break;
++ }
+ }
+
+ return 0;
+--- a/net/mac80211/chan.c
++++ b/net/mac80211/chan.c
+@@ -57,6 +57,22 @@ ieee80211_find_chanctx(struct ieee80211_
+ return NULL;
+ }
+
++static bool ieee80211_is_radar_required(struct ieee80211_local *local)
++{
++ struct ieee80211_sub_if_data *sdata;
++
++ rcu_read_lock();
++ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
++ if (sdata->radar_required) {
++ rcu_read_unlock();
++ return true;
++ }
++ }
++ rcu_read_unlock();
++
++ return false;
++}
++
+ static struct ieee80211_chanctx *
+ ieee80211_new_chanctx(struct ieee80211_local *local,
+ const struct cfg80211_chan_def *chandef,
+@@ -76,6 +92,9 @@ ieee80211_new_chanctx(struct ieee80211_l
+ ctx->conf.rx_chains_static = 1;
+ ctx->conf.rx_chains_dynamic = 1;
+ ctx->mode = mode;
++ ctx->conf.radar_enabled = ieee80211_is_radar_required(local);
++ if (!local->use_chanctx)
++ local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
+
+ /* acquire mutex to prevent idle from changing */
+ mutex_lock(&local->mtx);
+@@ -110,6 +129,7 @@ ieee80211_new_chanctx(struct ieee80211_l
+ static void ieee80211_free_chanctx(struct ieee80211_local *local,
+ struct ieee80211_chanctx *ctx)
+ {
++ bool check_single_channel = false;
+ lockdep_assert_held(&local->chanctx_mtx);
+
+ WARN_ON_ONCE(ctx->refcount != 0);
+@@ -119,6 +139,14 @@ static void ieee80211_free_chanctx(struc
+ chandef->width = NL80211_CHAN_WIDTH_20_NOHT;
+ chandef->center_freq1 = chandef->chan->center_freq;
+ chandef->center_freq2 = 0;
++
++ /* NOTE: Disabling radar is only valid here for
++ * single channel context. To be sure, check it ...
++ */
++ if (local->hw.conf.radar_enabled)
++ check_single_channel = true;
++ local->hw.conf.radar_enabled = false;
++
+ ieee80211_hw_config(local, 0);
+ } else {
+ drv_remove_chanctx(local, ctx);
+@@ -127,6 +155,9 @@ static void ieee80211_free_chanctx(struc
+ list_del_rcu(&ctx->list);
+ kfree_rcu(ctx, rcu_head);
+
++ /* throw a warning if this wasn't the only channel context. */
++ WARN_ON(check_single_channel && !list_empty(&local->chanctx_list));
++
+ mutex_lock(&local->mtx);
+ ieee80211_recalc_idle(local);
+ mutex_unlock(&local->mtx);
+@@ -238,19 +269,11 @@ static void __ieee80211_vif_release_chan
+ void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
+ struct ieee80211_chanctx *chanctx)
+ {
+- struct ieee80211_sub_if_data *sdata;
+- bool radar_enabled = false;
++ bool radar_enabled;
+
+ lockdep_assert_held(&local->chanctx_mtx);
+
+- rcu_read_lock();
+- list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+- if (sdata->radar_required) {
+- radar_enabled = true;
+- break;
+- }
+- }
+- rcu_read_unlock();
++ radar_enabled = ieee80211_is_radar_required(local);
+
+ if (radar_enabled == chanctx->conf.radar_enabled)
+ return;
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
+@@ -66,11 +66,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%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(SHORT_PREAMBLE),
TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -209,6 +209,8 @@ static void __ieee80211_sta_join_ibss(st
+ sdata->vif.bss_conf.enable_beacon = true;
+ sdata->vif.bss_conf.beacon_int = beacon_int;
+ sdata->vif.bss_conf.basic_rates = basic_rates;
++ sdata->vif.bss_conf.ssid_len = ifibss->ssid_len;
++ memcpy(sdata->vif.bss_conf.ssid, ifibss->ssid, ifibss->ssid_len);
+ bss_change = BSS_CHANGED_BEACON_INT;
+ bss_change |= ieee80211_reset_erp_info(sdata);
+ bss_change |= BSS_CHANGED_BSSID;
+@@ -217,6 +219,7 @@ static void __ieee80211_sta_join_ibss(st
+ bss_change |= BSS_CHANGED_BASIC_RATES;
+ bss_change |= BSS_CHANGED_HT;
+ bss_change |= BSS_CHANGED_IBSS;
++ bss_change |= BSS_CHANGED_SSID;
+
+ /*
+ * In 5 GHz/802.11a, we can always use short slot time.
+@@ -911,7 +914,7 @@ void ieee80211_rx_mgmt_probe_beacon(stru
+ return;
+
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
+- &elems);
++ false, &elems);
+
+ ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
+ }
+@@ -1159,6 +1162,7 @@ int ieee80211_ibss_leave(struct ieee8021
+ sdata->vif.bss_conf.ibss_joined = false;
+ sdata->vif.bss_conf.ibss_creator = false;
+ sdata->vif.bss_conf.enable_beacon = false;
++ sdata->vif.bss_conf.ssid_len = 0;
+ clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
+ ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
+ BSS_CHANGED_IBSS);
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -156,6 +156,7 @@ struct ieee80211_tx_data {
+ struct ieee80211_sub_if_data *sdata;
+ struct sta_info *sta;
+ struct ieee80211_key *key;
++ struct ieee80211_tx_rate rate;
+
+ unsigned int flags;
+ };
+@@ -740,6 +741,8 @@ struct ieee80211_sub_if_data {
+
+ /* bitmap of allowed (non-MCS) rate indexes for rate control */
+ u32 rc_rateidx_mask[IEEE80211_NUM_BANDS];
++
++ bool rc_has_mcs_mask[IEEE80211_NUM_BANDS];
+ u8 rc_rateidx_mcs_mask[IEEE80211_NUM_BANDS][IEEE80211_HT_MCS_MASK_LEN];
+
+ union {
+@@ -1025,7 +1028,7 @@ struct ieee80211_local {
+ enum mac80211_scan_state next_scan_state;
+ struct delayed_work scan_work;
+ struct ieee80211_sub_if_data __rcu *scan_sdata;
+- struct ieee80211_channel *csa_channel;
++ struct cfg80211_chan_def csa_chandef;
+ /* For backward compatibility only -- do not use */
+ struct cfg80211_chan_def _oper_chandef;
+
+@@ -1184,10 +1187,13 @@ struct ieee802_11_elems {
+ const u8 *perr;
+ const struct ieee80211_rann_ie *rann;
+ const struct ieee80211_channel_sw_ie *ch_switch_ie;
++ const struct ieee80211_ext_chansw_ie *ext_chansw_ie;
++ const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;
+ const u8 *country_elem;
+ const u8 *pwr_constr_elem;
+ const struct ieee80211_timeout_interval_ie *timeout_int;
+ const u8 *opmode_notif;
++ const struct ieee80211_sec_chan_offs_ie *sec_chan_offs;
+
+ /* length of them, respectively */
+ u8 ssid_len;
+@@ -1258,10 +1264,6 @@ void ieee80211_recalc_ps_vif(struct ieee
+ int ieee80211_max_network_latency(struct notifier_block *nb,
+ unsigned long data, void *dummy);
+ int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata);
+-void
+-ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
+- const struct ieee80211_channel_sw_ie *sw_elem,
+- struct ieee80211_bss *bss, u64 timestamp);
+ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata);
+ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+ struct sk_buff *skb);
+@@ -1499,13 +1501,13 @@ static inline void ieee80211_tx_skb(stru
+ ieee80211_tx_skb_tid(sdata, skb, 7);
+ }
+
+-u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
++u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, bool action,
+ struct ieee802_11_elems *elems,
+ u64 filter, u32 crc);
+-static inline void ieee802_11_parse_elems(u8 *start, size_t len,
++static inline void ieee802_11_parse_elems(u8 *start, size_t len, bool action,
+ struct ieee802_11_elems *elems)
+ {
+- ieee802_11_parse_elems_crc(start, len, elems, 0, 0);
++ ieee802_11_parse_elems_crc(start, len, action, elems, 0, 0);
+ }
+
+ u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -501,7 +501,6 @@ int ieee80211_do_open(struct wireless_de
- struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
- struct net_device *dev = wdev->netdev;
- struct ieee80211_local *local = sdata->local;
-- struct sta_info *sta;
- u32 changed = 0;
- int res;
- u32 hw_reconf_flags = 0;
-@@ -658,30 +657,8 @@ int ieee80211_do_open(struct wireless_de
+@@ -159,7 +159,8 @@ static int ieee80211_change_mtu(struct n
+ return 0;
+ }
- set_bit(SDATA_STATE_RUNNING, &sdata->state);
+-static int ieee80211_verify_mac(struct ieee80211_local *local, u8 *addr)
++static int ieee80211_verify_mac(struct ieee80211_local *local, u8 *addr,
++ bool check_dup)
+ {
+ struct ieee80211_sub_if_data *sdata;
+ u64 new, mask, tmp;
+@@ -179,10 +180,13 @@ static int ieee80211_verify_mac(struct i
+ ((u64)m[2] << 3*8) | ((u64)m[3] << 2*8) |
+ ((u64)m[4] << 1*8) | ((u64)m[5] << 0*8);
+
++ if (!check_dup)
++ return ret;
+
+ mutex_lock(&local->iflist_mtx);
+ list_for_each_entry(sdata, &local->interfaces, list) {
+- if (sdata->vif.type == NL80211_IFTYPE_MONITOR)
++ if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
++ !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
+ continue;
+
+ m = sdata->vif.addr;
+@@ -204,12 +208,17 @@ static int ieee80211_change_mac(struct n
+ {
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct sockaddr *sa = addr;
++ bool check_dup = true;
+ int ret;
+
+ if (ieee80211_sdata_running(sdata))
+ return -EBUSY;
+
+- ret = ieee80211_verify_mac(sdata->local, sa->sa_data);
++ if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
++ !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
++ check_dup = false;
++
++ ret = ieee80211_verify_mac(sdata->local, sa->sa_data, check_dup);
+ if (ret)
+ return ret;
+
+@@ -450,7 +459,6 @@ int ieee80211_do_open(struct wireless_de
+ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
+ struct net_device *dev = wdev->netdev;
+ struct ieee80211_local *local = sdata->local;
+- struct sta_info *sta;
+ u32 changed = 0;
+ int res;
+ u32 hw_reconf_flags = 0;
+@@ -474,6 +482,9 @@ int ieee80211_do_open(struct wireless_de
+ master->control_port_protocol;
+ sdata->control_port_no_encrypt =
+ master->control_port_no_encrypt;
++ sdata->vif.cab_queue = master->vif.cab_queue;
++ memcpy(sdata->vif.hw_queue, master->vif.hw_queue,
++ sizeof(sdata->vif.hw_queue));
+ break;
+ }
+ case NL80211_IFTYPE_AP:
+@@ -538,7 +549,11 @@ int ieee80211_do_open(struct wireless_de
+ break;
+ }
+
+- if (local->monitors == 0 && local->open_count == 0) {
++ if (sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE) {
++ res = drv_add_interface(local, sdata);
++ if (res)
++ goto err_stop;
++ } else if (local->monitors == 0 && local->open_count == 0) {
+ res = ieee80211_add_virtual_monitor(local);
+ if (res)
+ goto err_stop;
+@@ -609,30 +624,8 @@ int ieee80211_do_open(struct wireless_de
+
+ set_bit(SDATA_STATE_RUNNING, &sdata->state);
- if (sdata->vif.type == NL80211_IFTYPE_WDS) {
- /* Create STA entry for the WDS peer */
/*
* set_multicast_list will be invoked by the networking core
-@@ -1066,6 +1043,72 @@ static void ieee80211_if_setup(struct ne
+@@ -653,7 +646,11 @@ int ieee80211_do_open(struct wireless_de
+
+ ieee80211_recalc_ps(local, -1);
+
+- if (dev) {
++ if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||
++ sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
++ /* XXX: for AP_VLAN, actually track AP queues */
++ netif_tx_start_all_queues(dev);
++ } else if (dev) {
+ unsigned long flags;
+ int n_acs = IEEE80211_NUM_ACS;
+ int ac;
+@@ -916,7 +913,11 @@ static void ieee80211_do_stop(struct iee
+ mutex_lock(&local->mtx);
+ ieee80211_recalc_idle(local);
+ mutex_unlock(&local->mtx);
+- break;
++
++ if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
++ break;
++
++ /* fall through */
+ default:
+ if (going_down)
+ drv_remove_interface(local, sdata);
+@@ -1075,7 +1076,7 @@ static const struct net_device_ops ieee8
+ .ndo_start_xmit = ieee80211_monitor_start_xmit,
+ .ndo_set_rx_mode = ieee80211_set_multicast_list,
+ .ndo_change_mtu = ieee80211_change_mtu,
+- .ndo_set_mac_address = eth_mac_addr,
++ .ndo_set_mac_address = ieee80211_change_mac,
+ .ndo_select_queue = ieee80211_monitor_select_queue,
+ };
+
+@@ -1092,6 +1093,74 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
+ u32 rates = 0;
+ u16 stype;
+ bool new = false;
-+ enum ieee80211_band band = local->hw.conf.channel->band;
-+ struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
++ enum ieee80211_band band;
++ struct ieee80211_supported_band *sband;
+
+ rx_status = IEEE80211_SKB_RXCB(skb);
++ band = rx_status->band;
++ sband = local->hw.wiphy->bands[band];
+ mgmt = (struct ieee80211_mgmt *) skb->data;
+ stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
+
+ return;
+
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
-+ skb->len - baselen, &elems);
++ skb->len - baselen, false, &elems);
+
+ rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
+
+ }
+
+ sta->last_rx = jiffies;
-+ sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
++ sta->sta.supp_rates[band] = rates;
+
+ if (elems.ht_cap_elem)
+ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
-+ elems.ht_cap_elem, &sta->sta.ht_cap);
++ elems.ht_cap_elem, sta);
+
+ if (elems.wmm_param)
+ set_sta_flag(sta, WLAN_STA_WME);
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -1170,6 +1213,9 @@ static void ieee80211_iface_work(struct
+@@ -1196,6 +1265,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
default:
WARN(1, "frame for unexpected interface type");
break;
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2350,6 +2350,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 &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS &&
- sdata->vif.type != NL80211_IFTYPE_ADHOC)
- break;
+@@ -1718,6 +1790,15 @@ void ieee80211_remove_interfaces(struct
+
+ ASSERT_RTNL();
+
++ /*
++ * Close all AP_VLAN interfaces first, as otherwise they
++ * might be closed while the AP interface they belong to
++ * is closed, causing unregister_netdevice_many() to crash.
++ */
++ list_for_each_entry(sdata, &local->interfaces, list)
++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
++ dev_close(sdata->dev);
++
+ mutex_lock(&local->iflist_mtx);
+ list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
+ list_del(&sdata->list);
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -674,6 +674,7 @@ int ieee80211_register_hw(struct ieee802
+ int channels, max_bitrates;
+ bool supp_ht, supp_vht;
+ netdev_features_t feature_whitelist;
++ struct cfg80211_chan_def dflt_chandef = {};
+ static const u32 cipher_suites[] = {
+ /* keep WEP first, it may be removed below */
+ WLAN_CIPHER_SUITE_WEP40,
+@@ -751,19 +752,19 @@ int ieee80211_register_hw(struct ieee802
+ sband = local->hw.wiphy->bands[band];
+ if (!sband)
+ continue;
+- if (!local->use_chanctx && !local->_oper_chandef.chan) {
++
++ if (!dflt_chandef.chan) {
++ cfg80211_chandef_create(&dflt_chandef,
++ &sband->channels[0],
++ NL80211_CHAN_NO_HT);
+ /* init channel we're on */
+- struct cfg80211_chan_def chandef = {
+- .chan = &sband->channels[0],
+- .width = NL80211_CHAN_NO_HT,
+- .center_freq1 = sband->channels[0].center_freq,
+- .center_freq2 = 0
+- };
+- local->hw.conf.chandef = local->_oper_chandef = chandef;
++ if (!local->use_chanctx && !local->_oper_chandef.chan) {
++ local->hw.conf.chandef = dflt_chandef;
++ local->_oper_chandef = dflt_chandef;
++ }
++ local->monitor_chandef = dflt_chandef;
+ }
+- cfg80211_chandef_create(&local->monitor_chandef,
+- &sband->channels[0],
+- NL80211_CHAN_NO_HT);
++
+ channels += sband->n_channels;
-@@ -2655,14 +2656,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+ if (max_bitrates < sband->n_bitrates)
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
+@@ -838,7 +838,7 @@ ieee80211_mesh_rx_probe_req(struct ieee8
+ if (baselen > len)
+ return;
- if (!ieee80211_vif_is_mesh(&sdata->vif) &&
- sdata->vif.type != NL80211_IFTYPE_ADHOC &&
-- sdata->vif.type != NL80211_IFTYPE_STATION)
-+ sdata->vif.type != NL80211_IFTYPE_STATION &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
- return RX_DROP_MONITOR;
+- ieee802_11_parse_elems(pos, len - baselen, &elems);
++ ieee802_11_parse_elems(pos, len - baselen, false, &elems);
- 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_ASSOC_RESP):
- case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -2987,10 +2989,16 @@ static int prepare_for_handlers(struct i
- }
- break;
- case NL80211_IFTYPE_WDS:
-- if (bssid || !ieee80211_is_data(hdr->frame_control))
-- return 0;
- if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
- return 0;
-+
-+ if (ieee80211_is_data(hdr->frame_control) ||
-+ ieee80211_is_action(hdr->frame_control)) {
-+ if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
-+ return 0;
-+ } else if (!ieee80211_is_beacon(hdr->frame_control))
-+ return 0;
-+
- break;
- case NL80211_IFTYPE_P2P_DEVICE:
- if (!ieee80211_is_public_action(hdr, skb->len) &&
---- a/net/mac80211/sta_info.h
-+++ b/net/mac80211/sta_info.h
-@@ -32,7 +32,6 @@
- * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
- * frames.
- * @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.
-@@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
- WLAN_STA_AUTHORIZED,
- WLAN_STA_SHORT_PREAMBLE,
- WLAN_STA_WME,
-- WLAN_STA_WDS,
- WLAN_STA_CLEAR_PS_FILT,
- WLAN_STA_MFP,
- WLAN_STA_BLOCK_BA,
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -314,7 +314,6 @@ struct ath_rx {
- u32 *rxlink;
- u32 num_pkts;
- unsigned int rxfilter;
-- spinlock_t rxbuflock;
- struct list_head rxbuf;
- struct ath_descdma rxdma;
- struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX];
-@@ -324,7 +323,6 @@ struct ath_rx {
-
- int ath_startrecv(struct ath_softc *sc);
- bool ath_stoprecv(struct ath_softc *sc);
--void ath_flushrecv(struct ath_softc *sc);
- u32 ath_calcrxfilter(struct ath_softc *sc);
- int ath_rx_init(struct ath_softc *sc, int nbufs);
- void ath_rx_cleanup(struct ath_softc *sc);
-@@ -334,9 +332,8 @@ void ath_txq_lock(struct ath_softc *sc,
- void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq);
- void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq);
- void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
--bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
--void ath_draintxq(struct ath_softc *sc,
-- struct ath_txq *txq, bool retry_tx);
-+bool ath_drain_all_txq(struct ath_softc *sc);
-+void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq);
- void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);
- void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an);
- void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);
-@@ -641,7 +638,6 @@ void ath_ant_comb_update(struct ath_soft
- enum sc_op_flags {
- SC_OP_INVALID,
- SC_OP_BEACONS,
-- SC_OP_RXFLUSH,
- SC_OP_ANI_RUN,
- SC_OP_PRIM_STA_VIF,
- SC_OP_HW_RESET,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_gene
- skb->len, DMA_TO_DEVICE);
- dev_kfree_skb_any(skb);
- bf->bf_buf_addr = 0;
-+ bf->bf_mpdu = NULL;
+ /* 802.11-2012 10.1.4.3.2 */
+ if ((!ether_addr_equal(mgmt->da, sdata->vif.addr) &&
+@@ -899,7 +899,7 @@ static void ieee80211_mesh_rx_bcn_presp(
+ return;
+
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
+- &elems);
++ false, &elems);
+
+ /* ignore non-mesh or secure / unsecure mismatch */
+ if ((!elems.mesh_id || !elems.mesh_config) ||
+--- a/net/mac80211/mesh_hwmp.c
++++ b/net/mac80211/mesh_hwmp.c
+@@ -880,7 +880,7 @@ void mesh_rx_path_sel_frame(struct ieee8
+
+ baselen = (u8 *) mgmt->u.action.u.mesh_action.variable - (u8 *) mgmt;
+ ieee802_11_parse_elems(mgmt->u.action.u.mesh_action.variable,
+- len - baselen, &elems);
++ len - baselen, false, &elems);
+
+ if (elems.preq) {
+ if (elems.preq_len != 37)
+--- a/net/mac80211/mesh_plink.c
++++ b/net/mac80211/mesh_plink.c
+@@ -544,8 +544,8 @@ static void mesh_plink_timer(unsigned lo
+ return;
}
+ mpl_dbg(sta->sdata,
+- "Mesh plink timer for %pM fired on state %d\n",
+- sta->sta.addr, sta->plink_state);
++ "Mesh plink timer for %pM fired on state %s\n",
++ sta->sta.addr, mplstates[sta->plink_state]);
+ reason = 0;
+ llid = sta->llid;
+ plid = sta->plid;
+@@ -687,7 +687,7 @@ void mesh_rx_plink_frame(struct ieee8021
+ baseaddr += 4;
+ baselen += 4;
+ }
+- ieee802_11_parse_elems(baseaddr, len - baselen, &elems);
++ ieee802_11_parse_elems(baseaddr, len - baselen, true, &elems);
- skb = ieee80211_beacon_get(hw, vif);
-@@ -198,7 +199,7 @@ static struct ath_buf *ath9k_beacon_gene
- if (sc->nvifs > 1) {
- ath_dbg(common, BEACON,
- "Flushing previous cabq traffic\n");
-- ath_draintxq(sc, cabq, false);
-+ ath_draintxq(sc, cabq);
- }
+ if (!elems.peering) {
+ mpl_dbg(sdata,
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -289,6 +289,8 @@ ieee80211_determine_chantype(struct ieee
+ } else {
+ /* 40 MHz (and 80 MHz) must be supported for VHT */
+ ret = IEEE80211_STA_DISABLE_VHT;
++ /* also mark 40 MHz disabled */
++ ret |= IEEE80211_STA_DISABLE_40MHZ;
+ goto out;
}
-@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long
- return;
+@@ -303,12 +305,6 @@ ieee80211_determine_chantype(struct ieee
+ channel->band);
+ vht_chandef.center_freq2 = 0;
- bf = ath9k_beacon_generate(sc->hw, vif);
-- WARN_ON(!bf);
-
- if (sc->beacon.bmisscnt != 0) {
- ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct fil
- RXS_ERR("RX-LENGTH-ERR", rx_len_err);
- RXS_ERR("RX-OOM-ERR", rx_oom_err);
- RXS_ERR("RX-RATE-ERR", rx_rate_err);
-- RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
- RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
-
- PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -216,7 +216,6 @@ struct ath_tx_stats {
- * @rx_oom_err: No. of frames dropped due to OOM issues.
- * @rx_rate_err: No. of frames dropped due to rate errors.
- * @rx_too_many_frags_err: Frames dropped due to too-many-frags received.
-- * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
- * @rx_beacons: No. of beacons received.
- * @rx_frags: No. of rx-fragements received.
- */
-@@ -235,7 +234,6 @@ struct ath_rx_stats {
- u32 rx_oom_err;
- u32 rx_rate_err;
- u32 rx_too_many_frags_err;
-- u32 rx_drop_rxflush;
- u32 rx_beacons;
- u32 rx_frags;
- };
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_
- ath_start_ani(sc);
- }
+- if (vht_oper->center_freq_seg2_idx)
+- vht_chandef.center_freq2 =
+- ieee80211_channel_to_frequency(
+- vht_oper->center_freq_seg2_idx,
+- channel->band);
+-
+ switch (vht_oper->chan_width) {
+ case IEEE80211_VHT_CHANWIDTH_USE_HT:
+ vht_chandef.width = chandef->width;
+@@ -321,6 +317,10 @@ ieee80211_determine_chantype(struct ieee
+ break;
+ case IEEE80211_VHT_CHANWIDTH_80P80MHZ:
+ vht_chandef.width = NL80211_CHAN_WIDTH_80P80;
++ vht_chandef.center_freq2 =
++ ieee80211_channel_to_frequency(
++ vht_oper->center_freq_seg2_idx,
++ channel->band);
+ break;
+ default:
+ if (verbose)
+@@ -604,7 +604,6 @@ static void ieee80211_add_vht_ie(struct
+ u8 *pos;
+ u32 cap;
+ struct ieee80211_sta_vht_cap vht_cap;
+- int i;
--static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
-+static bool ath_prepare_reset(struct ath_softc *sc)
- {
- struct ath_hw *ah = sc->sc_ah;
- bool ret = true;
-@@ -196,20 +196,12 @@ static bool ath_prepare_reset(struct ath
- ath9k_debug_samp_bb_mac(sc);
- ath9k_hw_disable_interrupts(ah);
-
-- if (!ath_stoprecv(sc))
-+ if (!ath_drain_all_txq(sc))
- ret = false;
-
-- if (!ath_drain_all_txq(sc, retry_tx))
-+ if (!ath_stoprecv(sc))
- ret = false;
-
-- if (!flush) {
-- if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-- ath_rx_tasklet(sc, 1, true);
-- ath_rx_tasklet(sc, 1, false);
-- } else {
-- ath_flushrecv(sc);
+ BUILD_BUG_ON(sizeof(vht_cap) != sizeof(sband->vht_cap));
+
+@@ -632,37 +631,6 @@ static void ieee80211_add_vht_ie(struct
+ cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)))
+ cap &= ~IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
+
+- if (!(ap_vht_cap->vht_cap_info &
+- cpu_to_le32(IEEE80211_VHT_CAP_TXSTBC)))
+- cap &= ~(IEEE80211_VHT_CAP_RXSTBC_1 |
+- IEEE80211_VHT_CAP_RXSTBC_3 |
+- IEEE80211_VHT_CAP_RXSTBC_4);
+-
+- for (i = 0; i < 8; i++) {
+- int shift = i * 2;
+- u16 mask = IEEE80211_VHT_MCS_NOT_SUPPORTED << shift;
+- u16 ap_mcs, our_mcs;
+-
+- ap_mcs = (le16_to_cpu(ap_vht_cap->supp_mcs.tx_mcs_map) &
+- mask) >> shift;
+- our_mcs = (le16_to_cpu(vht_cap.vht_mcs.rx_mcs_map) &
+- mask) >> shift;
+-
+- if (our_mcs == IEEE80211_VHT_MCS_NOT_SUPPORTED)
+- continue;
+-
+- switch (ap_mcs) {
+- default:
+- if (our_mcs <= ap_mcs)
+- break;
+- /* fall through */
+- case IEEE80211_VHT_MCS_NOT_SUPPORTED:
+- vht_cap.vht_mcs.rx_mcs_map &= cpu_to_le16(~mask);
+- vht_cap.vht_mcs.rx_mcs_map |=
+- cpu_to_le16(ap_mcs << shift);
+- }
- }
-
- return ret;
- }
-
-@@ -255,18 +247,17 @@ static bool ath_complete_reset(struct at
- return true;
+ /* reserve and fill IE */
+ pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
+ ieee80211_ie_build_vht_cap(pos, &vht_cap, cap);
+@@ -998,16 +966,7 @@ static void ieee80211_chswitch_work(stru
+ if (!ifmgd->associated)
+ goto out;
+
+- /*
+- * FIXME: Here we are downgrading to NL80211_CHAN_WIDTH_20_NOHT
+- * and don't adjust our ht/vht settings
+- * This is wrong - we should behave according to the CSA params
+- */
+- local->_oper_chandef.chan = local->csa_channel;
+- local->_oper_chandef.width = NL80211_CHAN_WIDTH_20_NOHT;
+- local->_oper_chandef.center_freq1 =
+- local->_oper_chandef.chan->center_freq;
+- local->_oper_chandef.center_freq2 = 0;
++ local->_oper_chandef = local->csa_chandef;
+
+ if (!local->ops->channel_switch) {
+ /* call "hw_config" only if doing sw channel switch */
+@@ -1054,56 +1013,208 @@ static void ieee80211_chswitch_timer(uns
+ ieee80211_queue_work(&sdata->local->hw, &sdata->u.mgd.chswitch_work);
}
--static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
-- bool retry_tx)
-+static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)
+-void
++static void
+ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
+- const struct ieee80211_channel_sw_ie *sw_elem,
+- struct ieee80211_bss *bss, u64 timestamp)
++ u64 timestamp, struct ieee802_11_elems *elems,
++ bool beacon)
{
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath9k_hw_cal_data *caldata = NULL;
- bool fastcc = true;
-- bool flush = false;
- int r;
-
- __ath_cancel_work(sc);
+- struct cfg80211_bss *cbss =
+- container_of((void *)bss, struct cfg80211_bss, priv);
+- struct ieee80211_channel *new_ch;
++ struct ieee80211_local *local = sdata->local;
+ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+- int new_freq = ieee80211_channel_to_frequency(sw_elem->new_ch_num,
+- cbss->channel->band);
++ struct cfg80211_bss *cbss = ifmgd->associated;
++ struct ieee80211_bss *bss;
+ struct ieee80211_chanctx *chanctx;
++ enum ieee80211_band new_band;
++ int new_freq;
++ u8 new_chan_no;
++ u8 count;
++ u8 mode;
++ struct ieee80211_channel *new_chan;
++ struct cfg80211_chan_def new_chandef = {};
++ struct cfg80211_chan_def new_vht_chandef = {};
++ const struct ieee80211_sec_chan_offs_ie *sec_chan_offs;
++ const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;
++ const struct ieee80211_ht_operation *ht_oper;
++ int secondary_channel_offset = -1;
+
+ ASSERT_MGD_MTX(ifmgd);
+
+- if (!ifmgd->associated)
++ if (!cbss)
++ return;
++
++ if (local->scanning)
+ return;
-+ tasklet_disable(&sc->intr_tq);
- spin_lock_bh(&sc->sc_pcu_lock);
+- if (sdata->local->scanning)
++ /* disregard subsequent announcements if we are already processing */
++ if (ifmgd->flags & IEEE80211_STA_CSA_RECEIVED)
+ return;
- if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
-@@ -276,11 +267,10 @@ static int ath_reset_internal(struct ath
+- /* Disregard subsequent beacons if we are already running a timer
+- processing a CSA */
++ sec_chan_offs = elems->sec_chan_offs;
++ wide_bw_chansw_ie = elems->wide_bw_chansw_ie;
++ ht_oper = elems->ht_operation;
++
++ if (ifmgd->flags & (IEEE80211_STA_DISABLE_HT |
++ IEEE80211_STA_DISABLE_40MHZ)) {
++ sec_chan_offs = NULL;
++ wide_bw_chansw_ie = NULL;
++ /* only used for bandwidth here */
++ ht_oper = NULL;
++ }
- if (!hchan) {
- fastcc = false;
-- flush = true;
- hchan = ah->curchan;
+- if (ifmgd->flags & IEEE80211_STA_CSA_RECEIVED)
++ if (ifmgd->flags & IEEE80211_STA_DISABLE_VHT)
++ wide_bw_chansw_ie = NULL;
++
++ if (elems->ext_chansw_ie) {
++ if (!ieee80211_operating_class_to_band(
++ elems->ext_chansw_ie->new_operating_class,
++ &new_band)) {
++ sdata_info(sdata,
++ "cannot understand ECSA IE operating class %d, disconnecting\n",
++ elems->ext_chansw_ie->new_operating_class);
++ ieee80211_queue_work(&local->hw,
++ &ifmgd->csa_connection_drop_work);
++ }
++ new_chan_no = elems->ext_chansw_ie->new_ch_num;
++ count = elems->ext_chansw_ie->count;
++ mode = elems->ext_chansw_ie->mode;
++ } else if (elems->ch_switch_ie) {
++ new_band = cbss->channel->band;
++ new_chan_no = elems->ch_switch_ie->new_ch_num;
++ count = elems->ch_switch_ie->count;
++ mode = elems->ch_switch_ie->mode;
++ } else {
++ /* nothing here we understand */
+ return;
++ }
++
++ bss = (void *)cbss->priv;
+
+- new_ch = ieee80211_get_channel(sdata->local->hw.wiphy, new_freq);
+- if (!new_ch || new_ch->flags & IEEE80211_CHAN_DISABLED) {
++ new_freq = ieee80211_channel_to_frequency(new_chan_no, new_band);
++ new_chan = ieee80211_get_channel(sdata->local->hw.wiphy, new_freq);
++ if (!new_chan || new_chan->flags & IEEE80211_CHAN_DISABLED) {
+ sdata_info(sdata,
+ "AP %pM switches to unsupported channel (%d MHz), disconnecting\n",
+ ifmgd->associated->bssid, new_freq);
+- ieee80211_queue_work(&sdata->local->hw,
++ ieee80211_queue_work(&local->hw,
++ &ifmgd->csa_connection_drop_work);
++ return;
++ }
++
++ if (!beacon && sec_chan_offs) {
++ secondary_channel_offset = sec_chan_offs->sec_chan_offs;
++ } else if (beacon && ht_oper) {
++ secondary_channel_offset =
++ ht_oper->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET;
++ } else if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HT)) {
++ /*
++ * If it's not a beacon, HT is enabled and the IE not present,
++ * it's 20 MHz, 802.11-2012 8.5.2.6:
++ * This element [the Secondary Channel Offset Element] is
++ * present when switching to a 40 MHz channel. It may be
++ * present when switching to a 20 MHz channel (in which
++ * case the secondary channel offset is set to SCN).
++ */
++ secondary_channel_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
++ }
++
++ switch (secondary_channel_offset) {
++ default:
++ /* secondary_channel_offset was present but is invalid */
++ case IEEE80211_HT_PARAM_CHA_SEC_NONE:
++ cfg80211_chandef_create(&new_chandef, new_chan,
++ NL80211_CHAN_HT20);
++ break;
++ case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
++ cfg80211_chandef_create(&new_chandef, new_chan,
++ NL80211_CHAN_HT40PLUS);
++ break;
++ case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
++ cfg80211_chandef_create(&new_chandef, new_chan,
++ NL80211_CHAN_HT40MINUS);
++ break;
++ case -1:
++ cfg80211_chandef_create(&new_chandef, new_chan,
++ NL80211_CHAN_NO_HT);
++ break;
++ }
++
++ if (wide_bw_chansw_ie) {
++ new_vht_chandef.chan = new_chan;
++ new_vht_chandef.center_freq1 =
++ ieee80211_channel_to_frequency(
++ wide_bw_chansw_ie->new_center_freq_seg0,
++ new_band);
++
++ switch (wide_bw_chansw_ie->new_channel_width) {
++ default:
++ /* hmmm, ignore VHT and use HT if present */
++ case IEEE80211_VHT_CHANWIDTH_USE_HT:
++ new_vht_chandef.chan = NULL;
++ break;
++ case IEEE80211_VHT_CHANWIDTH_80MHZ:
++ new_vht_chandef.width = NL80211_CHAN_WIDTH_80;
++ break;
++ case IEEE80211_VHT_CHANWIDTH_160MHZ:
++ new_vht_chandef.width = NL80211_CHAN_WIDTH_160;
++ break;
++ case IEEE80211_VHT_CHANWIDTH_80P80MHZ:
++ /* field is otherwise reserved */
++ new_vht_chandef.center_freq2 =
++ ieee80211_channel_to_frequency(
++ wide_bw_chansw_ie->new_center_freq_seg1,
++ new_band);
++ new_vht_chandef.width = NL80211_CHAN_WIDTH_80P80;
++ break;
++ }
++ if (ifmgd->flags & IEEE80211_STA_DISABLE_80P80MHZ &&
++ new_vht_chandef.width == NL80211_CHAN_WIDTH_80P80)
++ chandef_downgrade(&new_vht_chandef);
++ if (ifmgd->flags & IEEE80211_STA_DISABLE_160MHZ &&
++ new_vht_chandef.width == NL80211_CHAN_WIDTH_160)
++ chandef_downgrade(&new_vht_chandef);
++ if (ifmgd->flags & IEEE80211_STA_DISABLE_40MHZ &&
++ new_vht_chandef.width > NL80211_CHAN_WIDTH_20)
++ chandef_downgrade(&new_vht_chandef);
++ }
++
++ /* if VHT data is there validate & use it */
++ if (new_vht_chandef.chan) {
++ if (!cfg80211_chandef_compatible(&new_vht_chandef,
++ &new_chandef)) {
++ sdata_info(sdata,
++ "AP %pM CSA has inconsistent channel data, disconnecting\n",
++ ifmgd->associated->bssid);
++ ieee80211_queue_work(&local->hw,
++ &ifmgd->csa_connection_drop_work);
++ return;
++ }
++ new_chandef = new_vht_chandef;
++ }
++
++ if (!cfg80211_chandef_usable(local->hw.wiphy, &new_chandef,
++ IEEE80211_CHAN_DISABLED)) {
++ sdata_info(sdata,
++ "AP %pM switches to unsupported channel (%d MHz, width:%d, CF1/2: %d/%d MHz), disconnecting\n",
++ ifmgd->associated->bssid, new_freq,
++ new_chandef.width, new_chandef.center_freq1,
++ new_chandef.center_freq2);
++ ieee80211_queue_work(&local->hw,
+ &ifmgd->csa_connection_drop_work);
+ return;
}
-- if (!ath_prepare_reset(sc, retry_tx, flush))
-+ if (!ath_prepare_reset(sc))
- fastcc = false;
-
- ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
-@@ -302,6 +292,8 @@ static int ath_reset_internal(struct ath
-
- out:
- spin_unlock_bh(&sc->sc_pcu_lock);
-+ tasklet_enable(&sc->intr_tq);
-+
- return r;
- }
+ ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
-@@ -319,7 +311,7 @@ static int ath_set_channel(struct ath_so
- if (test_bit(SC_OP_INVALID, &sc->sc_flags))
- return -EIO;
+- if (sdata->local->use_chanctx) {
++ if (local->use_chanctx) {
+ sdata_info(sdata,
+ "not handling channel switch with channel contexts\n");
+- ieee80211_queue_work(&sdata->local->hw,
++ ieee80211_queue_work(&local->hw,
+ &ifmgd->csa_connection_drop_work);
+ return;
+ }
-- r = ath_reset_internal(sc, hchan, false);
-+ r = ath_reset_internal(sc, hchan);
+- mutex_lock(&sdata->local->chanctx_mtx);
++ mutex_lock(&local->chanctx_mtx);
+ if (WARN_ON(!rcu_access_pointer(sdata->vif.chanctx_conf))) {
+- mutex_unlock(&sdata->local->chanctx_mtx);
++ mutex_unlock(&local->chanctx_mtx);
+ return;
+ }
+ chanctx = container_of(rcu_access_pointer(sdata->vif.chanctx_conf),
+@@ -1111,40 +1222,39 @@ ieee80211_sta_process_chanswitch(struct
+ if (chanctx->refcount > 1) {
+ sdata_info(sdata,
+ "channel switch with multiple interfaces on the same channel, disconnecting\n");
+- ieee80211_queue_work(&sdata->local->hw,
++ ieee80211_queue_work(&local->hw,
+ &ifmgd->csa_connection_drop_work);
+- mutex_unlock(&sdata->local->chanctx_mtx);
++ mutex_unlock(&local->chanctx_mtx);
+ return;
+ }
+- mutex_unlock(&sdata->local->chanctx_mtx);
++ mutex_unlock(&local->chanctx_mtx);
+
+- sdata->local->csa_channel = new_ch;
++ local->csa_chandef = new_chandef;
+
+- if (sw_elem->mode)
+- ieee80211_stop_queues_by_reason(&sdata->local->hw,
++ if (mode)
++ ieee80211_stop_queues_by_reason(&local->hw,
+ IEEE80211_MAX_QUEUE_MAP,
+ IEEE80211_QUEUE_STOP_REASON_CSA);
+
+- if (sdata->local->ops->channel_switch) {
++ if (local->ops->channel_switch) {
+ /* use driver's channel switch callback */
+ struct ieee80211_channel_switch ch_switch = {
+ .timestamp = timestamp,
+- .block_tx = sw_elem->mode,
+- .channel = new_ch,
+- .count = sw_elem->count,
++ .block_tx = mode,
++ .chandef = new_chandef,
++ .count = count,
+ };
+
+- drv_channel_switch(sdata->local, &ch_switch);
++ drv_channel_switch(local, &ch_switch);
+ return;
+ }
- return r;
- }
-@@ -549,23 +541,21 @@ chip_reset:
- #undef SCHED_INTR
+ /* channel switch handled in software */
+- if (sw_elem->count <= 1)
+- ieee80211_queue_work(&sdata->local->hw, &ifmgd->chswitch_work);
++ if (count <= 1)
++ ieee80211_queue_work(&local->hw, &ifmgd->chswitch_work);
+ else
+ mod_timer(&ifmgd->chswitch_timer,
+- TU_TO_EXP_TIME(sw_elem->count *
+- cbss->beacon_interval));
++ TU_TO_EXP_TIME(count * cbss->beacon_interval));
}
--static int ath_reset(struct ath_softc *sc, bool retry_tx)
-+static int ath_reset(struct ath_softc *sc)
- {
-- int r;
-+ int i, r;
-
- ath9k_ps_wakeup(sc);
-
-- r = ath_reset_internal(sc, NULL, retry_tx);
-+ r = ath_reset_internal(sc, NULL);
-
-- if (retry_tx) {
-- int i;
-- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-- if (ATH_TXQ_SETUP(sc, i)) {
-- spin_lock_bh(&sc->tx.txq[i].axq_lock);
-- ath_txq_schedule(sc, &sc->tx.txq[i]);
-- spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-- }
-- }
-+ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-+ if (!ATH_TXQ_SETUP(sc, i))
-+ continue;
-+
-+ spin_lock_bh(&sc->tx.txq[i].axq_lock);
-+ ath_txq_schedule(sc, &sc->tx.txq[i]);
-+ spin_unlock_bh(&sc->tx.txq[i].axq_lock);
- }
+ static u32 ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
+@@ -2120,7 +2230,6 @@ void ieee80211_beacon_loss(struct ieee80
- ath9k_ps_restore(sc);
-@@ -586,7 +576,7 @@ void ath_reset_work(struct work_struct *
- {
- struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
+ trace_api_beacon_loss(sdata);
-- ath_reset(sc, true);
-+ ath_reset(sc);
+- WARN_ON(hw->flags & IEEE80211_HW_CONNECTION_MONITOR);
+ sdata->u.mgd.connection_loss = false;
+ ieee80211_queue_work(hw, &sdata->u.mgd.beacon_connection_loss_work);
}
+@@ -2170,7 +2279,7 @@ static void ieee80211_auth_challenge(str
+ u32 tx_flags = 0;
- /**********************/
-@@ -804,7 +794,7 @@ static void ath9k_stop(struct ieee80211_
- ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+ pos = mgmt->u.auth.variable;
+- ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
++ ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), false, &elems);
+ if (!elems.challenge)
+ return;
+ auth_data->expected_transaction = 4;
+@@ -2435,7 +2544,7 @@ static bool ieee80211_assoc_success(stru
}
-- ath_prepare_reset(sc, false, true);
-+ ath_prepare_reset(sc);
+ pos = mgmt->u.assoc_resp.variable;
+- ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
++ ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), false, &elems);
- if (sc->rx.frag) {
- dev_kfree_skb_any(sc->rx.frag);
-@@ -1731,11 +1721,11 @@ static void ath9k_flush(struct ieee80211
- if (drop) {
- ath9k_ps_wakeup(sc);
- spin_lock_bh(&sc->sc_pcu_lock);
-- drain_txq = ath_drain_all_txq(sc, false);
-+ drain_txq = ath_drain_all_txq(sc);
- spin_unlock_bh(&sc->sc_pcu_lock);
+ if (!elems.supp_rates) {
+ sdata_info(sdata, "no SuppRates element in AssocResp\n");
+@@ -2604,7 +2713,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
+ capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
- if (!drain_txq)
-- ath_reset(sc, false);
-+ ath_reset(sc);
+ pos = mgmt->u.assoc_resp.variable;
+- ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
++ ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), false, &elems);
- ath9k_ps_restore(sc);
- ieee80211_wake_queues(hw);
-@@ -1835,6 +1825,9 @@ static u32 fill_chainmask(u32 cap, u32 n
+ if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
+ elems.timeout_int &&
+@@ -2659,6 +2768,8 @@ static void ieee80211_rx_bss_info(struct
+ struct ieee80211_channel *channel;
+ bool need_ps = false;
- static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
- {
-+ if (AR_SREV_9300_20_OR_LATER(ah))
-+ return true;
++ lockdep_assert_held(&sdata->u.mgd.mtx);
+
- switch (val & 0x7) {
- case 0x1:
- case 0x3:
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -248,8 +248,6 @@ rx_init_fail:
-
- static void ath_edma_start_recv(struct ath_softc *sc)
- {
-- spin_lock_bh(&sc->rx.rxbuflock);
--
- ath9k_hw_rxena(sc->sc_ah);
+ if ((sdata->u.mgd.associated &&
+ ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) ||
+ (sdata->u.mgd.assoc_data &&
+@@ -2689,7 +2800,8 @@ static void ieee80211_rx_bss_info(struct
+ if (bss)
+ ieee80211_rx_bss_put(local, bss);
+
+- if (!sdata->u.mgd.associated)
++ if (!sdata->u.mgd.associated ||
++ !ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid))
+ return;
- ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP,
-@@ -261,8 +259,6 @@ static void ath_edma_start_recv(struct a
- ath_opmode_init(sc);
+ if (need_ps) {
+@@ -2698,10 +2810,9 @@ static void ieee80211_rx_bss_info(struct
+ mutex_unlock(&local->iflist_mtx);
+ }
- ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
--
-- spin_unlock_bh(&sc->rx.rxbuflock);
+- if (elems->ch_switch_ie &&
+- memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid, ETH_ALEN) == 0)
+- ieee80211_sta_process_chanswitch(sdata, elems->ch_switch_ie,
+- bss, rx_status->mactime);
++ ieee80211_sta_process_chanswitch(sdata, rx_status->mactime,
++ elems, true);
++
}
- static void ath_edma_stop_recv(struct ath_softc *sc)
-@@ -279,8 +275,6 @@ int ath_rx_init(struct ath_softc *sc, in
- int error = 0;
- spin_lock_init(&sc->sc_pcu_lock);
-- spin_lock_init(&sc->rx.rxbuflock);
-- clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
+@@ -2726,7 +2837,7 @@ static void ieee80211_rx_mgmt_probe_resp
+ return;
- common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
- sc->sc_ah->caps.rx_status_len;
-@@ -438,7 +432,6 @@ int ath_startrecv(struct ath_softc *sc)
- return 0;
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
+- &elems);
++ false, &elems);
+
+ ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
+
+@@ -2809,7 +2920,7 @@ ieee80211_rx_mgmt_beacon(struct ieee8021
+ if (ifmgd->assoc_data && ifmgd->assoc_data->need_beacon &&
+ ether_addr_equal(mgmt->bssid, ifmgd->assoc_data->bss->bssid)) {
+ ieee802_11_parse_elems(mgmt->u.beacon.variable,
+- len - baselen, &elems);
++ len - baselen, false, &elems);
+
+ ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
+ ifmgd->assoc_data->have_beacon = true;
+@@ -2919,7 +3030,7 @@ ieee80211_rx_mgmt_beacon(struct ieee8021
+
+ ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4);
+ ncrc = ieee802_11_parse_elems_crc(mgmt->u.beacon.variable,
+- len - baselen, &elems,
++ len - baselen, false, &elems,
+ care_about_ies, ncrc);
+
+ if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) {
+@@ -3066,6 +3177,8 @@ void ieee80211_sta_rx_queued_mgmt(struct
+ enum rx_mgmt_action rma = RX_MGMT_NONE;
+ u8 deauth_buf[IEEE80211_DEAUTH_FRAME_LEN];
+ u16 fc;
++ struct ieee802_11_elems elems;
++ int ies_len;
+
+ rx_status = (struct ieee80211_rx_status *) skb->cb;
+ mgmt = (struct ieee80211_mgmt *) skb->data;
+@@ -3095,14 +3208,48 @@ void ieee80211_sta_rx_queued_mgmt(struct
+ rma = ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len, &bss);
+ break;
+ case IEEE80211_STYPE_ACTION:
+- switch (mgmt->u.action.category) {
+- case WLAN_CATEGORY_SPECTRUM_MGMT:
++ if (mgmt->u.action.category == WLAN_CATEGORY_SPECTRUM_MGMT) {
++ ies_len = skb->len -
++ offsetof(struct ieee80211_mgmt,
++ u.action.u.chan_switch.variable);
++
++ if (ies_len < 0)
++ break;
++
++ ieee802_11_parse_elems(
++ mgmt->u.action.u.chan_switch.variable,
++ ies_len, true, &elems);
++
++ if (elems.parse_error)
++ break;
++
+ ieee80211_sta_process_chanswitch(sdata,
+- &mgmt->u.action.u.chan_switch.sw_elem,
+- (void *)ifmgd->associated->priv,
+- rx_status->mactime);
+- break;
++ rx_status->mactime,
++ &elems, false);
++ } else if (mgmt->u.action.category == WLAN_CATEGORY_PUBLIC) {
++ ies_len = skb->len -
++ offsetof(struct ieee80211_mgmt,
++ u.action.u.ext_chan_switch.variable);
++
++ if (ies_len < 0)
++ break;
++
++ ieee802_11_parse_elems(
++ mgmt->u.action.u.ext_chan_switch.variable,
++ ies_len, true, &elems);
++
++ if (elems.parse_error)
++ break;
++
++ /* for the handling code pretend this was also an IE */
++ elems.ext_chansw_ie =
++ &mgmt->u.action.u.ext_chan_switch.data;
++
++ ieee80211_sta_process_chanswitch(sdata,
++ rx_status->mactime,
++ &elems, false);
+ }
++ break;
}
+ mutex_unlock(&ifmgd->mtx);
-- spin_lock_bh(&sc->rx.rxbuflock);
- if (list_empty(&sc->rx.rxbuf))
- goto start_recv;
+@@ -4197,7 +4344,7 @@ int ieee80211_mgd_deauth(struct ieee8021
+ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+ u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
+ bool tx = !req->local_state_change;
+- bool sent_frame = false;
++ bool report_frame = false;
-@@ -459,26 +452,31 @@ start_recv:
- ath_opmode_init(sc);
- ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
+ mutex_lock(&ifmgd->mtx);
-- spin_unlock_bh(&sc->rx.rxbuflock);
--
+@@ -4214,7 +4361,7 @@ int ieee80211_mgd_deauth(struct ieee8021
+ ieee80211_destroy_auth_data(sdata, false);
+ mutex_unlock(&ifmgd->mtx);
+
+- sent_frame = tx;
++ report_frame = true;
+ goto out;
+ }
+
+@@ -4222,12 +4369,12 @@ int ieee80211_mgd_deauth(struct ieee8021
+ ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {
+ ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
+ req->reason_code, tx, frame_buf);
+- sent_frame = tx;
++ report_frame = true;
+ }
+ mutex_unlock(&ifmgd->mtx);
+
+ out:
+- if (sent_frame)
++ if (report_frame)
+ __cfg80211_send_deauth(sdata->dev, frame_buf,
+ IEEE80211_DEAUTH_FRAME_LEN);
+
+--- a/net/mac80211/pm.c
++++ b/net/mac80211/pm.c
+@@ -38,8 +38,8 @@ int __ieee80211_suspend(struct ieee80211
+ IEEE80211_MAX_QUEUE_MAP,
+ IEEE80211_QUEUE_STOP_REASON_SUSPEND);
+
+- /* flush out all packets */
+- synchronize_net();
++ /* flush out all packets and station cleanup call_rcu()s */
++ rcu_barrier();
+
+ ieee80211_flush_queues(local, NULL);
+
+--- a/net/mac80211/rate.c
++++ b/net/mac80211/rate.c
+@@ -252,6 +252,25 @@ rate_lowest_non_cck_index(struct ieee802
return 0;
}
-+static void ath_flushrecv(struct ath_softc *sc)
++static void __rate_control_send_low(struct ieee80211_hw *hw,
++ struct ieee80211_supported_band *sband,
++ struct ieee80211_sta *sta,
++ struct ieee80211_tx_info *info)
+{
-+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-+ ath_rx_tasklet(sc, 1, true);
-+ ath_rx_tasklet(sc, 1, false);
++ if ((sband->band != IEEE80211_BAND_2GHZ) ||
++ !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE))
++ info->control.rates[0].idx = rate_lowest_index(sband, sta);
++ else
++ info->control.rates[0].idx =
++ rate_lowest_non_cck_index(sband, sta);
++
++ info->control.rates[0].count =
++ (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
++ 1 : hw->max_rate_tries;
++
++ info->control.skip_table = 1;
+}
+
- bool ath_stoprecv(struct ath_softc *sc)
- {
- struct ath_hw *ah = sc->sc_ah;
- bool stopped, reset = false;
-- spin_lock_bh(&sc->rx.rxbuflock);
- ath9k_hw_abortpcurecv(ah);
- ath9k_hw_setrxfilter(ah, 0);
- stopped = ath9k_hw_stopdmarecv(ah, &reset);
+ bool rate_control_send_low(struct ieee80211_sta *sta,
+ void *priv_sta,
+@@ -262,16 +281,8 @@ bool rate_control_send_low(struct ieee80
+ int mcast_rate;
-+ ath_flushrecv(sc);
+ if (!sta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
+- if ((sband->band != IEEE80211_BAND_2GHZ) ||
+- !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE))
+- info->control.rates[0].idx =
+- rate_lowest_index(txrc->sband, sta);
+- else
+- info->control.rates[0].idx =
+- rate_lowest_non_cck_index(txrc->sband, sta);
+- info->control.rates[0].count =
+- (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
+- 1 : txrc->hw->max_rate_tries;
++ __rate_control_send_low(txrc->hw, sband, sta, info);
+
- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- ath_edma_stop_recv(sc);
- else
- sc->rx.rxlink = NULL;
-- spin_unlock_bh(&sc->rx.rxbuflock);
-
- if (!(ah->ah_flags & AH_UNPLUGGED) &&
- unlikely(!stopped)) {
-@@ -490,15 +488,6 @@ bool ath_stoprecv(struct ath_softc *sc)
- return stopped && !reset;
- }
-
--void ath_flushrecv(struct ath_softc *sc)
--{
-- set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-- ath_rx_tasklet(sc, 1, true);
-- ath_rx_tasklet(sc, 1, false);
-- clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
--}
--
- static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
+ if (!sta && txrc->bss) {
+ mcast_rate = txrc->bss_conf->mcast_rate[sband->band];
+ if (mcast_rate > 0) {
+@@ -355,7 +366,8 @@ static bool rate_idx_match_mcs_mask(stru
+
+
+ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
+- struct ieee80211_tx_rate_control *txrc,
++ struct ieee80211_supported_band *sband,
++ enum nl80211_chan_width chan_width,
+ u32 mask,
+ u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN])
{
- /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
-@@ -735,6 +724,7 @@ static struct ath_buf *ath_get_next_rx_b
- return NULL;
- }
-
-+ list_del(&bf->list);
- if (!bf->bf_mpdu)
- return bf;
-
-@@ -1050,16 +1040,12 @@ int ath_rx_tasklet(struct ath_softc *sc,
- dma_type = DMA_FROM_DEVICE;
-
- qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
-- spin_lock_bh(&sc->rx.rxbuflock);
+@@ -375,27 +387,17 @@ static void rate_idx_match_mask(struct i
+ IEEE80211_TX_RC_USE_SHORT_PREAMBLE);
+ alt_rate.count = rate->count;
+ if (rate_idx_match_legacy_mask(&alt_rate,
+- txrc->sband->n_bitrates,
+- mask)) {
++ sband->n_bitrates, mask)) {
+ *rate = alt_rate;
+ return;
+ }
+ } else {
+- struct sk_buff *skb = txrc->skb;
+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+- __le16 fc;
+-
+ /* handle legacy rates */
+- if (rate_idx_match_legacy_mask(rate, txrc->sband->n_bitrates,
+- mask))
++ if (rate_idx_match_legacy_mask(rate, sband->n_bitrates, mask))
+ return;
+
+ /* if HT BSS, and we handle a data frame, also try HT rates */
+- if (txrc->bss_conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT)
+- return;
+-
+- fc = hdr->frame_control;
+- if (!ieee80211_is_data(fc))
++ if (chan_width == NL80211_CHAN_WIDTH_20_NOHT)
+ return;
- tsf = ath9k_hw_gettsf64(ah);
- tsf_lower = tsf & 0xffffffff;
+ alt_rate.idx = 0;
+@@ -408,7 +410,7 @@ static void rate_idx_match_mask(struct i
- do {
- bool decrypt_error = false;
-- /* If handling rx interrupt and flush is in progress => exit */
-- if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
-- break;
+ alt_rate.flags |= IEEE80211_TX_RC_MCS;
- memset(&rs, 0, sizeof(rs));
- if (edma)
-@@ -1102,15 +1088,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
+- if (txrc->bss_conf->chandef.width == NL80211_CHAN_WIDTH_40)
++ if (chan_width == NL80211_CHAN_WIDTH_40)
+ alt_rate.flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
- ath_debug_stat_rx(sc, &rs);
+ if (rate_idx_match_mcs_mask(&alt_rate, mcs_mask)) {
+@@ -426,6 +428,228 @@ static void rate_idx_match_mask(struct i
+ */
+ }
-- /*
-- * If we're asked to flush receive queue, directly
-- * chain it back at the queue without processing it.
-- */
-- if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
-- RX_STAT_INC(rx_drop_rxflush);
-- goto requeue_drop_frag;
-- }
--
- memset(rxs, 0, sizeof(struct ieee80211_rx_status));
-
- rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
-@@ -1245,19 +1222,18 @@ requeue_drop_frag:
- sc->rx.frag = NULL;
- }
- requeue:
-+ list_add_tail(&bf->list, &sc->rx.rxbuf);
-+ if (flush)
-+ continue;
++static void rate_fixup_ratelist(struct ieee80211_vif *vif,
++ struct ieee80211_supported_band *sband,
++ struct ieee80211_tx_info *info,
++ struct ieee80211_tx_rate *rates,
++ int max_rates)
++{
++ struct ieee80211_rate *rate;
++ bool inval = false;
++ int i;
+
- if (edma) {
-- list_add_tail(&bf->list, &sc->rx.rxbuf);
- ath_rx_edma_buf_link(sc, qtype);
- } else {
-- list_move_tail(&bf->list, &sc->rx.rxbuf);
- ath_rx_buf_link(sc, bf);
-- if (!flush)
-- ath9k_hw_rxena(ah);
-+ ath9k_hw_rxena(ah);
- }
- } while (1);
-
-- spin_unlock_bh(&sc->rx.rxbuflock);
--
- if (!(ah->imask & ATH9K_INT_RXEOL)) {
- ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
- ath9k_hw_set_interrupts(ah);
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -4586,14 +4586,14 @@ static int ar9003_hw_cal_pier_get(struct
- return 0;
- }
-
--static int ar9003_hw_power_control_override(struct ath_hw *ah,
-- int frequency,
-- int *correction,
-- int *voltage, int *temperature)
-+static void ar9003_hw_power_control_override(struct ath_hw *ah,
-+ int frequency,
-+ int *correction,
-+ int *voltage, int *temperature)
- {
-- int tempSlope = 0;
-+ int temp_slope = 0, temp_slope1 = 0, temp_slope2 = 0;
- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- int f[8], t[8], i;
-+ int f[8], t[8], t1[3], t2[3], i;
-
- REG_RMW(ah, AR_PHY_TPC_11_B0,
- (correction[0] << AR_PHY_TPC_OLPC_GAIN_DELTA_S),
-@@ -4624,38 +4624,108 @@ static int ar9003_hw_power_control_overr
- * enable temperature compensation
- * Need to use register names
- */
-- if (frequency < 4000)
-- tempSlope = eep->modalHeader2G.tempSlope;
-- else if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
-- for (i = 0; i < 8; i++) {
-- t[i] = eep->base_ext1.tempslopextension[i];
-- f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
-- }
-- tempSlope = ar9003_hw_power_interpolate((s32) frequency,
-- f, t, 8);
-- } else if (eep->base_ext2.tempSlopeLow != 0) {
-- t[0] = eep->base_ext2.tempSlopeLow;
-- f[0] = 5180;
-- t[1] = eep->modalHeader5G.tempSlope;
-- f[1] = 5500;
-- t[2] = eep->base_ext2.tempSlopeHigh;
-- f[2] = 5785;
-- tempSlope = ar9003_hw_power_interpolate((s32) frequency,
-- f, t, 3);
-- } else
-- tempSlope = eep->modalHeader5G.tempSlope;
-+ if (frequency < 4000) {
-+ temp_slope = eep->modalHeader2G.tempSlope;
-+ } else {
-+ if (AR_SREV_9550(ah)) {
-+ t[0] = eep->base_ext1.tempslopextension[2];
-+ t1[0] = eep->base_ext1.tempslopextension[3];
-+ t2[0] = eep->base_ext1.tempslopextension[4];
-+ f[0] = 5180;
-+
-+ t[1] = eep->modalHeader5G.tempSlope;
-+ t1[1] = eep->base_ext1.tempslopextension[0];
-+ t2[1] = eep->base_ext1.tempslopextension[1];
-+ f[1] = 5500;
-+
-+ t[2] = eep->base_ext1.tempslopextension[5];
-+ t1[2] = eep->base_ext1.tempslopextension[6];
-+ t2[2] = eep->base_ext1.tempslopextension[7];
-+ f[2] = 5785;
-+
-+ temp_slope = ar9003_hw_power_interpolate(frequency,
-+ f, t, 3);
-+ temp_slope1 = ar9003_hw_power_interpolate(frequency,
-+ f, t1, 3);
-+ temp_slope2 = ar9003_hw_power_interpolate(frequency,
-+ f, t2, 3);
-+
-+ goto tempslope;
-+ }
++ /*
++ * Set up the RTS/CTS rate as the fastest basic rate
++ * that is not faster than the data rate unless there
++ * is no basic rate slower than the data rate, in which
++ * case we pick the slowest basic rate
++ *
++ * XXX: Should this check all retry rates?
++ */
++ if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) {
++ u32 basic_rates = vif->bss_conf.basic_rates;
++ s8 baserate = basic_rates ? ffs(basic_rates - 1) : 0;
+
-+ if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
-+ for (i = 0; i < 8; i++) {
-+ t[i] = eep->base_ext1.tempslopextension[i];
-+ f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
-+ }
-+ temp_slope = ar9003_hw_power_interpolate((s32) frequency,
-+ f, t, 8);
-+ } else if (eep->base_ext2.tempSlopeLow != 0) {
-+ t[0] = eep->base_ext2.tempSlopeLow;
-+ f[0] = 5180;
-+ t[1] = eep->modalHeader5G.tempSlope;
-+ f[1] = 5500;
-+ t[2] = eep->base_ext2.tempSlopeHigh;
-+ f[2] = 5785;
-+ temp_slope = ar9003_hw_power_interpolate((s32) frequency,
-+ f, t, 3);
-+ } else {
-+ temp_slope = eep->modalHeader5G.tempSlope;
++ rate = &sband->bitrates[rates[0].idx];
++
++ for (i = 0; i < sband->n_bitrates; i++) {
++ /* must be a basic rate */
++ if (!(basic_rates & BIT(i)))
++ continue;
++ /* must not be faster than the data rate */
++ if (sband->bitrates[i].bitrate > rate->bitrate)
++ continue;
++ /* maximum */
++ if (sband->bitrates[baserate].bitrate <
++ sband->bitrates[i].bitrate)
++ baserate = i;
+ }
++
++ info->control.rts_cts_rate_idx = baserate;
+ }
-
-- REG_RMW_FIELD(ah, AR_PHY_TPC_19, AR_PHY_TPC_19_ALPHA_THERM, tempSlope);
-+tempslope:
-+ if (AR_SREV_9550(ah)) {
++
++ for (i = 0; i < max_rates; i++) {
+ /*
-+ * AR955x has tempSlope register for each chain.
-+ * Check whether temp_compensation feature is enabled or not.
++ * make sure there's no valid rate following
++ * an invalid one, just in case drivers don't
++ * take the API seriously to stop at -1.
+ */
-+ if (eep->baseEepHeader.featureEnable & 0x1) {
-+ if (frequency < 4000) {
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ eep->base_ext2.tempSlopeLow);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ temp_slope);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ eep->base_ext2.tempSlopeHigh);
-+ } else {
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ temp_slope);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ temp_slope1);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
-+ AR_PHY_TPC_19_ALPHA_THERM,
-+ temp_slope2);
-+ }
++ if (inval) {
++ rates[i].idx = -1;
++ continue;
++ }
++ if (rates[i].idx < 0) {
++ inval = true;
++ continue;
++ }
++
++ /*
++ * For now assume MCS is already set up correctly, this
++ * needs to be fixed.
++ */
++ if (rates[i].flags & IEEE80211_TX_RC_MCS) {
++ WARN_ON(rates[i].idx > 76);
++
++ if (!(rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) &&
++ info->control.use_cts_prot)
++ rates[i].flags |=
++ IEEE80211_TX_RC_USE_CTS_PROTECT;
++ continue;
++ }
++
++ if (rates[i].flags & IEEE80211_TX_RC_VHT_MCS) {
++ WARN_ON(ieee80211_rate_get_vht_mcs(&rates[i]) > 9);
++ continue;
++ }
++
++ /* set up RTS protection if desired */
++ if (info->control.use_rts) {
++ rates[i].flags |= IEEE80211_TX_RC_USE_RTS_CTS;
++ info->control.use_cts_prot = false;
++ }
++
++ /* RC is busted */
++ if (WARN_ON_ONCE(rates[i].idx >= sband->n_bitrates)) {
++ rates[i].idx = -1;
++ continue;
++ }
++
++ rate = &sband->bitrates[rates[i].idx];
++
++ /* set up short preamble */
++ if (info->control.short_preamble &&
++ rate->flags & IEEE80211_RATE_SHORT_PREAMBLE)
++ rates[i].flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
++
++ /* set up G protection */
++ if (!(rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) &&
++ info->control.use_cts_prot &&
++ rate->flags & IEEE80211_RATE_ERP_G)
++ rates[i].flags |= IEEE80211_TX_RC_USE_CTS_PROTECT;
++ }
++}
++
++
++static void rate_control_fill_sta_table(struct ieee80211_sta *sta,
++ struct ieee80211_tx_info *info,
++ struct ieee80211_tx_rate *rates,
++ int max_rates)
++{
++ struct ieee80211_sta_rates *ratetbl = NULL;
++ int i;
++
++ if (sta && !info->control.skip_table)
++ ratetbl = rcu_dereference(sta->rates);
++
++ /* Fill remaining rate slots with data from the sta rate table. */
++ max_rates = min_t(int, max_rates, IEEE80211_TX_RATE_TABLE_SIZE);
++ for (i = 0; i < max_rates; i++) {
++ if (i < ARRAY_SIZE(info->control.rates) &&
++ info->control.rates[i].idx >= 0 &&
++ info->control.rates[i].count) {
++ if (rates != info->control.rates)
++ rates[i] = info->control.rates[i];
++ } else if (ratetbl) {
++ rates[i].idx = ratetbl->rate[i].idx;
++ rates[i].flags = ratetbl->rate[i].flags;
++ if (info->control.use_rts)
++ rates[i].count = ratetbl->rate[i].count_rts;
++ else if (info->control.use_cts_prot)
++ rates[i].count = ratetbl->rate[i].count_cts;
++ else
++ rates[i].count = ratetbl->rate[i].count;
+ } else {
-+ /*
-+ * If temp compensation is not enabled,
-+ * set all registers to 0.
-+ */
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19,
-+ AR_PHY_TPC_19_ALPHA_THERM, 0);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
-+ AR_PHY_TPC_19_ALPHA_THERM, 0);
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
-+ AR_PHY_TPC_19_ALPHA_THERM, 0);
++ rates[i].idx = -1;
++ rates[i].count = 0;
+ }
-+ } else {
-+ REG_RMW_FIELD(ah, AR_PHY_TPC_19,
-+ AR_PHY_TPC_19_ALPHA_THERM, temp_slope);
++
++ if (rates[i].idx < 0 || !rates[i].count)
++ break;
++ }
++}
++
++static void rate_control_apply_mask(struct ieee80211_sub_if_data *sdata,
++ struct ieee80211_sta *sta,
++ struct ieee80211_supported_band *sband,
++ struct ieee80211_tx_info *info,
++ struct ieee80211_tx_rate *rates,
++ int max_rates)
++{
++ enum nl80211_chan_width chan_width;
++ u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
++ bool has_mcs_mask;
++ u32 mask;
++ int i;
++
++ /*
++ * Try to enforce the rateidx mask the user wanted. skip this if the
++ * default mask (allow all rates) is used to save some processing for
++ * the common case.
++ */
++ mask = sdata->rc_rateidx_mask[info->band];
++ has_mcs_mask = sdata->rc_has_mcs_mask[info->band];
++ if (mask == (1 << sband->n_bitrates) - 1 && !has_mcs_mask)
++ return;
++
++ if (has_mcs_mask)
++ memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
++ sizeof(mcs_mask));
++ else
++ memset(mcs_mask, 0xff, sizeof(mcs_mask));
++
++ if (sta) {
++ /* Filter out rates that the STA does not support */
++ mask &= sta->supp_rates[info->band];
++ for (i = 0; i < sizeof(mcs_mask); i++)
++ mcs_mask[i] &= sta->ht_cap.mcs.rx_mask[i];
++ }
++
++ /*
++ * Make sure the rate index selected for each TX rate is
++ * included in the configured mask and change the rate indexes
++ * if needed.
++ */
++ chan_width = sdata->vif.bss_conf.chandef.width;
++ for (i = 0; i < max_rates; i++) {
++ /* Skip invalid rates */
++ if (rates[i].idx < 0)
++ break;
++
++ rate_idx_match_mask(&rates[i], sband, chan_width, mask,
++ mcs_mask);
+ }
++}
++
++void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
++ struct ieee80211_sta *sta,
++ struct sk_buff *skb,
++ struct ieee80211_tx_rate *dest,
++ int max_rates)
++{
++ struct ieee80211_sub_if_data *sdata;
++ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
++ struct ieee80211_supported_band *sband;
++
++ rate_control_fill_sta_table(sta, info, dest, max_rates);
++
++ if (!vif)
++ return;
++
++ sdata = vif_to_sdata(vif);
++ sband = sdata->local->hw.wiphy->bands[info->band];
++
++ if (ieee80211_is_data(hdr->frame_control))
++ rate_control_apply_mask(sdata, sta, sband, info, dest, max_rates);
++
++ if (dest[0].idx < 0)
++ __rate_control_send_low(&sdata->local->hw, sband, sta, info);
++
++ if (sta)
++ rate_fixup_ratelist(vif, sband, info, dest, max_rates);
++}
++EXPORT_SYMBOL(ieee80211_get_tx_rates);
++
+ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
+ struct sta_info *sta,
+ struct ieee80211_tx_rate_control *txrc)
+@@ -435,8 +659,6 @@ void rate_control_get_rate(struct ieee80
+ struct ieee80211_sta *ista = NULL;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
+ int i;
+- u32 mask;
+- u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
+
+ if (sta && test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) {
+ ista = &sta->sta;
+@@ -454,37 +676,27 @@ void rate_control_get_rate(struct ieee80
+
+ ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
+
+- /*
+- * Try to enforce the rateidx mask the user wanted. skip this if the
+- * default mask (allow all rates) is used to save some processing for
+- * the common case.
+- */
+- mask = sdata->rc_rateidx_mask[info->band];
+- memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
+- sizeof(mcs_mask));
+- if (mask != (1 << txrc->sband->n_bitrates) - 1) {
+- if (sta) {
+- /* Filter out rates that the STA does not support */
+- mask &= sta->sta.supp_rates[info->band];
+- for (i = 0; i < sizeof(mcs_mask); i++)
+- mcs_mask[i] &= sta->sta.ht_cap.mcs.rx_mask[i];
+- }
+- /*
+- * Make sure the rate index selected for each TX rate is
+- * included in the configured mask and change the rate indexes
+- * if needed.
+- */
+- for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+- /* Skip invalid rates */
+- if (info->control.rates[i].idx < 0)
+- break;
+- rate_idx_match_mask(&info->control.rates[i], txrc,
+- mask, mcs_mask);
+- }
+- }
++ if (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_RC_TABLE)
++ return;
- if (AR_SREV_9462_20(ah))
- REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
-- AR_PHY_TPC_19_B1_ALPHA_THERM, tempSlope);
-+ AR_PHY_TPC_19_B1_ALPHA_THERM, temp_slope);
+- BUG_ON(info->control.rates[0].idx < 0);
++ ieee80211_get_tx_rates(&sdata->vif, ista, txrc->skb,
++ info->control.rates,
++ ARRAY_SIZE(info->control.rates));
++}
++
++int rate_control_set_rates(struct ieee80211_hw *hw,
++ struct ieee80211_sta *pubsta,
++ struct ieee80211_sta_rates *rates)
++{
++ struct ieee80211_sta_rates *old = rcu_dereference(pubsta->rates);
++
++ rcu_assign_pointer(pubsta->rates, rates);
++ if (old)
++ kfree_rcu(old, rcu_head);
++
++ return 0;
+ }
++EXPORT_SYMBOL(rate_control_set_rates);
+ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+ const char *name)
+--- a/net/mac80211/rc80211_minstrel.c
++++ b/net/mac80211/rc80211_minstrel.c
+@@ -84,6 +84,50 @@ minstrel_sort_best_tp_rates(struct minst
+ }
- REG_RMW_FIELD(ah, AR_PHY_TPC_18, AR_PHY_TPC_18_THERM_CAL_VALUE,
- temperature[0]);
--
-- return 0;
+ static void
++minstrel_set_rate(struct minstrel_sta_info *mi, struct ieee80211_sta_rates *ratetbl,
++ int offset, int idx)
++{
++ struct minstrel_rate *r = &mi->r[idx];
++
++ ratetbl->rate[offset].idx = r->rix;
++ ratetbl->rate[offset].count = r->adjusted_retry_count;
++ ratetbl->rate[offset].count_cts = r->retry_count_cts;
++ ratetbl->rate[offset].count_rts = r->retry_count_rtscts;
++}
++
++static void
++minstrel_update_rates(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
++{
++ struct ieee80211_sta_rates *ratetbl;
++ int i = 0;
++
++ ratetbl = kzalloc(sizeof(*ratetbl), GFP_ATOMIC);
++ if (!ratetbl)
++ return;
++
++ /* Start with max_tp_rate */
++ minstrel_set_rate(mi, ratetbl, i++, mi->max_tp_rate[0]);
++
++ if (mp->hw->max_rates >= 3) {
++ /* At least 3 tx rates supported, use max_tp_rate2 next */
++ minstrel_set_rate(mi, ratetbl, i++, mi->max_tp_rate[1]);
++ }
++
++ if (mp->hw->max_rates >= 2) {
++ /* At least 2 tx rates supported, use max_prob_rate next */
++ minstrel_set_rate(mi, ratetbl, i++, mi->max_prob_rate);
++ }
++
++ /* Use lowest rate last */
++ ratetbl->rate[i].idx = mi->lowest_rix;
++ ratetbl->rate[i].count = mp->max_retry;
++ ratetbl->rate[i].count_cts = mp->max_retry;
++ ratetbl->rate[i].count_rts = mp->max_retry;
++
++ rate_control_set_rates(mp->hw, mi->sta, ratetbl);
++}
++
++static void
+ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
+ {
+ u8 tmp_tp_rate[MAX_THR_RATES];
+@@ -161,6 +205,8 @@ minstrel_update_stats(struct minstrel_pr
+
+ /* Reset update timer */
+ mi->stats_update = jiffies;
++
++ minstrel_update_rates(mp, mi);
}
- /* Apply the recorded correction values. */
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -68,7 +68,7 @@ static const int m2ThreshExt_off = 127;
- static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
+ static void
+@@ -209,9 +255,9 @@ minstrel_get_retry_count(struct minstrel
{
- u16 bMode, fracMode = 0, aModeRefSel = 0;
-- u32 freq, channelSel = 0, reg32 = 0;
-+ u32 freq, chan_frac, div, channelSel = 0, reg32 = 0;
- struct chan_centers centers;
- int loadSynthChannel;
-
-@@ -77,9 +77,6 @@ static int ar9003_hw_set_channel(struct
-
- if (freq < 4800) { /* 2 GHz, fractional mode */
- if (AR_SREV_9330(ah)) {
-- u32 chan_frac;
-- u32 div;
+ unsigned int retry = mr->adjusted_retry_count;
+
+- if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)
++ if (info->control.use_rts)
+ retry = max(2U, min(mr->retry_count_rtscts, retry));
+- else if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
++ else if (info->control.use_cts_prot)
+ retry = max(2U, min(mr->retry_count_cts, retry));
+ return retry;
+ }
+@@ -240,13 +286,12 @@ minstrel_get_rate(void *priv, struct iee
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ struct minstrel_sta_info *mi = priv_sta;
+ struct minstrel_priv *mp = priv;
+- struct ieee80211_tx_rate *ar = info->control.rates;
+- unsigned int ndx, sample_ndx = 0;
++ struct ieee80211_tx_rate *rate = &info->control.rates[0];
++ struct minstrel_rate *msr, *mr;
++ unsigned int ndx;
+ bool mrr_capable;
+- bool indirect_rate_sampling = false;
+- bool rate_sampling = false;
+- int i, delta;
+- int mrr_ndx[3];
++ bool prev_sample = mi->prev_sample;
++ int delta;
+ int sampling_ratio;
+
+ /* management/no-ack frames do not use rate control */
+@@ -262,107 +307,75 @@ minstrel_get_rate(void *priv, struct iee
+ else
+ sampling_ratio = mp->lookaround_rate;
+
+- /* init rateindex [ndx] with max throughput rate */
+- ndx = mi->max_tp_rate[0];
-
- if (ah->is_clk_25mhz)
- div = 75;
- else
-@@ -89,34 +86,40 @@ static int ar9003_hw_set_channel(struct
- chan_frac = (((freq * 4) % div) * 0x20000) / div;
- channelSel = (channelSel << 17) | chan_frac;
- } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
-- u32 chan_frac;
+ /* increase sum packet counter */
+ mi->packet_count++;
+
+ delta = (mi->packet_count * sampling_ratio / 100) -
+ (mi->sample_count + mi->sample_deferred / 2);
+
+- /* delta > 0: sampling required */
+- if ((delta > 0) && (mrr_capable || !mi->prev_sample)) {
+- struct minstrel_rate *msr;
+- if (mi->packet_count >= 10000) {
+- mi->sample_deferred = 0;
+- mi->sample_count = 0;
+- mi->packet_count = 0;
+- } else if (delta > mi->n_rates * 2) {
+- /* With multi-rate retry, not every planned sample
+- * attempt actually gets used, due to the way the retry
+- * chain is set up - [max_tp,sample,prob,lowest] for
+- * sample_rate < max_tp.
+- *
+- * If there's too much sampling backlog and the link
+- * starts getting worse, minstrel would start bursting
+- * out lots of sampling frames, which would result
+- * in a large throughput loss. */
+- mi->sample_count += (delta - mi->n_rates * 2);
+- }
++ /* delta < 0: no sampling required */
++ mi->prev_sample = false;
++ if (delta < 0 || (!mrr_capable && prev_sample))
++ return;
+
+- /* get next random rate sample */
+- sample_ndx = minstrel_get_next_sample(mi);
+- msr = &mi->r[sample_ndx];
+- rate_sampling = true;
-
- /*
-- * freq_ref = 40 / (refdiva >> amoderefsel); where refdiva=1 and amoderefsel=0
-+ * freq_ref = 40 / (refdiva >> amoderefsel);
-+ * where refdiva=1 and amoderefsel=0
- * ndiv = ((chan_mhz * 4) / 3) / freq_ref;
- * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000
- */
- channelSel = (freq * 4) / 120;
- chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
- channelSel = (channelSel << 17) | chan_frac;
-- } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
-+ } else if (AR_SREV_9340(ah)) {
- if (ah->is_clk_25mhz) {
-- u32 chan_frac;
+- /* Decide if direct ( 1st mrr stage) or indirect (2nd mrr stage)
+- * rate sampling method should be used.
+- * Respect such rates that are not sampled for 20 interations.
+- */
+- if (mrr_capable &&
+- msr->perfect_tx_time > mi->r[ndx].perfect_tx_time &&
+- msr->sample_skipped < 20)
+- indirect_rate_sampling = true;
-
- channelSel = (freq * 2) / 75;
- chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
- channelSel = (channelSel << 17) | chan_frac;
+- if (!indirect_rate_sampling) {
+- if (msr->sample_limit != 0) {
+- ndx = sample_ndx;
+- mi->sample_count++;
+- if (msr->sample_limit > 0)
+- msr->sample_limit--;
- } else
-+ } else {
- channelSel = CHANSEL_2G(freq) >> 1;
-- } else
-+ }
-+ } else if (AR_SREV_9550(ah)) {
-+ if (ah->is_clk_25mhz)
-+ div = 75;
-+ else
-+ div = 120;
+- rate_sampling = false;
+- } else {
+- /* Only use IEEE80211_TX_CTL_RATE_CTRL_PROBE to mark
+- * packets that have the sampling rate deferred to the
+- * second MRR stage. Increase the sample counter only
+- * if the deferred sample rate was actually used.
+- * Use the sample_deferred counter to make sure that
+- * the sampling is not done in large bursts */
+- info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
+- mi->sample_deferred++;
+- }
++ if (mi->packet_count >= 10000) {
++ mi->sample_deferred = 0;
++ mi->sample_count = 0;
++ mi->packet_count = 0;
++ } else if (delta > mi->n_rates * 2) {
++ /* With multi-rate retry, not every planned sample
++ * attempt actually gets used, due to the way the retry
++ * chain is set up - [max_tp,sample,prob,lowest] for
++ * sample_rate < max_tp.
++ *
++ * If there's too much sampling backlog and the link
++ * starts getting worse, minstrel would start bursting
++ * out lots of sampling frames, which would result
++ * in a large throughput loss. */
++ mi->sample_count += (delta - mi->n_rates * 2);
++ }
+
-+ channelSel = (freq * 4) / div;
-+ chan_frac = (((freq * 4) % div) * 0x20000) / div;
-+ channelSel = (channelSel << 17) | chan_frac;
-+ } else {
- channelSel = CHANSEL_2G(freq);
-+ }
- /* Set to 2G mode */
- bMode = 1;
- } else {
- if ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) &&
- ah->is_clk_25mhz) {
-- u32 chan_frac;
++ /* get next random rate sample */
++ ndx = minstrel_get_next_sample(mi);
++ msr = &mi->r[ndx];
++ mr = &mi->r[mi->max_tp_rate[0]];
++
++ /* Decide if direct ( 1st mrr stage) or indirect (2nd mrr stage)
++ * rate sampling method should be used.
++ * Respect such rates that are not sampled for 20 interations.
++ */
++ if (mrr_capable &&
++ msr->perfect_tx_time > mr->perfect_tx_time &&
++ msr->sample_skipped < 20) {
++ /* Only use IEEE80211_TX_CTL_RATE_CTRL_PROBE to mark
++ * packets that have the sampling rate deferred to the
++ * second MRR stage. Increase the sample counter only
++ * if the deferred sample rate was actually used.
++ * Use the sample_deferred counter to make sure that
++ * the sampling is not done in large bursts */
++ info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
++ rate++;
++ mi->sample_deferred++;
++ } else {
++ if (!msr->sample_limit != 0)
++ return;
++
++ mi->sample_count++;
++ if (msr->sample_limit > 0)
++ msr->sample_limit--;
+ }
+- mi->prev_sample = rate_sampling;
+
+ /* If we're not using MRR and the sampling rate already
+ * has a probability of >95%, we shouldn't be attempting
+ * to use it, as this only wastes precious airtime */
+- if (!mrr_capable && rate_sampling &&
++ if (!mrr_capable &&
+ (mi->r[ndx].probability > MINSTREL_FRAC(95, 100)))
+- ndx = mi->max_tp_rate[0];
-
- channelSel = freq / 75;
- chan_frac = ((freq % 75) * 0x20000) / 75;
- channelSel = (channelSel << 17) | chan_frac;
-@@ -586,32 +589,19 @@ static void ar9003_hw_init_bb(struct ath
- ath9k_hw_synth_delay(ah, chan, synthDelay);
- }
-
--static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
-+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
- {
-- switch (rx) {
-- case 0x5:
-+ if (ah->caps.tx_chainmask == 5 || ah->caps.rx_chainmask == 5)
- REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
- AR_PHY_SWAP_ALT_CHAIN);
-- case 0x3:
-- case 0x1:
-- case 0x2:
-- case 0x7:
-- REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
-- REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
-- break;
-- default:
-- break;
+- /* mrr setup for 1st stage */
+- ar[0].idx = mi->r[ndx].rix;
+- ar[0].count = minstrel_get_retry_count(&mi->r[ndx], info);
+-
+- /* non mrr setup for 2nd stage */
+- if (!mrr_capable) {
+- if (!rate_sampling)
+- ar[0].count = mp->max_retry;
+- ar[1].idx = mi->lowest_rix;
+- ar[1].count = mp->max_retry;
+ return;
- }
-+
-+ REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
-+ REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
-
- if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && (tx == 0x7))
-- REG_WRITE(ah, AR_SELFGEN_MASK, 0x3);
-- else
-- REG_WRITE(ah, AR_SELFGEN_MASK, tx);
-+ tx = 3;
-- if (tx == 0x5) {
-- REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
-- AR_PHY_SWAP_ALT_CHAIN);
+- /* mrr setup for 2nd stage */
+- if (rate_sampling) {
+- if (indirect_rate_sampling)
+- mrr_ndx[0] = sample_ndx;
+- else
+- mrr_ndx[0] = mi->max_tp_rate[0];
+- } else {
+- mrr_ndx[0] = mi->max_tp_rate[1];
+- }
++ mi->prev_sample = true;
+
+- /* mrr setup for 3rd & 4th stage */
+- mrr_ndx[1] = mi->max_prob_rate;
+- mrr_ndx[2] = 0;
+- for (i = 1; i < 4; i++) {
+- ar[i].idx = mi->r[mrr_ndx[i - 1]].rix;
+- ar[i].count = mi->r[mrr_ndx[i - 1]].adjusted_retry_count;
- }
-+ REG_WRITE(ah, AR_SELFGEN_MASK, tx);
++ rate->idx = mi->r[ndx].rix;
++ rate->count = minstrel_get_retry_count(&mi->r[ndx], info);
}
- /*
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -1028,7 +1028,7 @@
- #define AR_PHY_TPC_5_B2 (AR_SM2_BASE + 0x208)
- #define AR_PHY_TPC_6_B2 (AR_SM2_BASE + 0x20c)
- #define AR_PHY_TPC_11_B2 (AR_SM2_BASE + 0x220)
--#define AR_PHY_PDADC_TAB_2 (AR_SM2_BASE + 0x240)
-+#define AR_PHY_TPC_19_B2 (AR_SM2_BASE + 0x240)
- #define AR_PHY_TX_IQCAL_STATUS_B2 (AR_SM2_BASE + 0x48c)
- #define AR_PHY_TX_IQCAL_CORR_COEFF_B2(_i) (AR_SM2_BASE + 0x450 + ((_i) << 2))
-
---- a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
-@@ -23,16 +23,16 @@
- static const u32 ar955x_1p0_radio_postamble[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xd28b3330, 0xd28b3330},
-- {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x06345f2a, 0x06345f2a},
-- {0x000160ac, 0xa4647c00, 0xa4647c00, 0xa4646800, 0xa4646800},
-- {0x000160b0, 0x01885f52, 0x01885f52, 0x04accf3a, 0x04accf3a},
-- {0x00016104, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
-+ {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a},
-+ {0x000160ac, 0xa4647c00, 0xa4647c00, 0x24647c00, 0x24647c00},
-+ {0x000160b0, 0x01885f52, 0x01885f52, 0x01885f52, 0x01885f52},
-+ {0x00016104, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
- {0x0001610c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
- {0x00016140, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
-- {0x00016504, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
-+ {0x00016504, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
- {0x0001650c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
- {0x00016540, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
-- {0x00016904, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
-+ {0x00016904, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
- {0x0001690c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
- {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
- };
-@@ -69,15 +69,15 @@ static const u32 ar955x_1p0_baseband_pos
- {0x0000a204, 0x005c0ec0, 0x005c0ec4, 0x005c0ec4, 0x005c0ec0},
- {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
- {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
-- {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
-+ {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
- {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
- {0x0000a238, 0xffb01018, 0xffb01018, 0xffb01018, 0xffb01018},
- {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
- {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
- {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-- {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-+ {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01010e0e, 0x01010e0e},
- {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
-- {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-+ {0x0000a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
- {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
- {0x0000a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
- {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
-@@ -125,7 +125,7 @@ static const u32 ar955x_1p0_radio_core[]
- {0x00016094, 0x00000000},
- {0x000160a0, 0x0a108ffe},
- {0x000160a4, 0x812fc370},
-- {0x000160a8, 0x423c8000},
-+ {0x000160a8, 0x423c8100},
- {0x000160b4, 0x92480080},
- {0x000160c0, 0x006db6d0},
- {0x000160c4, 0x6db6db60},
-@@ -134,7 +134,7 @@ static const u32 ar955x_1p0_radio_core[]
- {0x00016100, 0x11999601},
- {0x00016108, 0x00080010},
- {0x00016144, 0x02084080},
-- {0x00016148, 0x000080c0},
-+ {0x00016148, 0x00008040},
- {0x00016280, 0x01800804},
- {0x00016284, 0x00038dc5},
- {0x00016288, 0x00000000},
-@@ -178,7 +178,7 @@ static const u32 ar955x_1p0_radio_core[]
- {0x00016500, 0x11999601},
- {0x00016508, 0x00080010},
- {0x00016544, 0x02084080},
-- {0x00016548, 0x000080c0},
-+ {0x00016548, 0x00008040},
- {0x00016780, 0x00000000},
- {0x00016784, 0x00000000},
- {0x00016788, 0x00400705},
-@@ -218,7 +218,7 @@ static const u32 ar955x_1p0_radio_core[]
- {0x00016900, 0x11999601},
- {0x00016908, 0x00080010},
- {0x00016944, 0x02084080},
-- {0x00016948, 0x000080c0},
-+ {0x00016948, 0x00008040},
- {0x00016b80, 0x00000000},
- {0x00016b84, 0x00000000},
- {0x00016b88, 0x00400705},
-@@ -245,9 +245,9 @@ static const u32 ar955x_1p0_radio_core[]
-
- static const u32 ar955x_1p0_modes_xpa_tx_gain_table[][9] = {
- /* Addr 5G_HT20_L 5G_HT40_L 5G_HT20_M 5G_HT40_M 5G_HT20_H 5G_HT40_H 2G_HT40 2G_HT20 */
-- {0x0000a2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-- {0x0000a2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-- {0x0000a2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
-+ {0x0000a2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
-+ {0x0000a2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
-+ {0x0000a2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
- {0x0000a2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
- {0x0000a410, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050da, 0x000050da},
- {0x0000a500, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000000, 0x00000000},
-@@ -256,63 +256,63 @@ static const u32 ar955x_1p0_modes_xpa_tx
- {0x0000a50c, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c000006, 0x0c000006},
- {0x0000a510, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x0f00000a, 0x0f00000a},
- {0x0000a514, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x1300000c, 0x1300000c},
-- {0x0000a518, 0x19004008, 0x19004008, 0x19004008, 0x19004008, 0x18004008, 0x18004008, 0x1700000e, 0x1700000e},
-- {0x0000a51c, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1c00400a, 0x1c00400a, 0x1b000064, 0x1b000064},
-- {0x0000a520, 0x230020a2, 0x230020a2, 0x210020a2, 0x210020a2, 0x200020a2, 0x200020a2, 0x1f000242, 0x1f000242},
-- {0x0000a524, 0x2500006e, 0x2500006e, 0x2500006e, 0x2500006e, 0x2400006e, 0x2400006e, 0x23000229, 0x23000229},
-- {0x0000a528, 0x29022221, 0x29022221, 0x28022221, 0x28022221, 0x27022221, 0x27022221, 0x270002a2, 0x270002a2},
-- {0x0000a52c, 0x2d00062a, 0x2d00062a, 0x2c00062a, 0x2c00062a, 0x2a00062a, 0x2a00062a, 0x2c001203, 0x2c001203},
-- {0x0000a530, 0x340220a5, 0x340220a5, 0x320220a5, 0x320220a5, 0x2f0220a5, 0x2f0220a5, 0x30001803, 0x30001803},
-- {0x0000a534, 0x380022c5, 0x380022c5, 0x350022c5, 0x350022c5, 0x320022c5, 0x320022c5, 0x33000881, 0x33000881},
-- {0x0000a538, 0x3b002486, 0x3b002486, 0x39002486, 0x39002486, 0x36002486, 0x36002486, 0x38001809, 0x38001809},
-- {0x0000a53c, 0x3f00248a, 0x3f00248a, 0x3d00248a, 0x3d00248a, 0x3a00248a, 0x3a00248a, 0x3a000814, 0x3a000814},
-- {0x0000a540, 0x4202242c, 0x4202242c, 0x4102242c, 0x4102242c, 0x3f02242c, 0x3f02242c, 0x3f001a0c, 0x3f001a0c},
-- {0x0000a544, 0x490044c6, 0x490044c6, 0x460044c6, 0x460044c6, 0x420044c6, 0x420044c6, 0x43001a0e, 0x43001a0e},
-- {0x0000a548, 0x4d024485, 0x4d024485, 0x4a024485, 0x4a024485, 0x46024485, 0x46024485, 0x46001812, 0x46001812},
-- {0x0000a54c, 0x51044483, 0x51044483, 0x4e044483, 0x4e044483, 0x4a044483, 0x4a044483, 0x49001884, 0x49001884},
-- {0x0000a550, 0x5404a40c, 0x5404a40c, 0x5204a40c, 0x5204a40c, 0x4d04a40c, 0x4d04a40c, 0x4d001e84, 0x4d001e84},
-- {0x0000a554, 0x57024632, 0x57024632, 0x55024632, 0x55024632, 0x52024632, 0x52024632, 0x50001e69, 0x50001e69},
-- {0x0000a558, 0x5c00a634, 0x5c00a634, 0x5900a634, 0x5900a634, 0x5600a634, 0x5600a634, 0x550006f4, 0x550006f4},
-- {0x0000a55c, 0x5f026832, 0x5f026832, 0x5d026832, 0x5d026832, 0x5a026832, 0x5a026832, 0x59000ad3, 0x59000ad3},
-- {0x0000a560, 0x6602b012, 0x6602b012, 0x6202b012, 0x6202b012, 0x5d02b012, 0x5d02b012, 0x5e000ad5, 0x5e000ad5},
-- {0x0000a564, 0x6e02d0e1, 0x6e02d0e1, 0x6802d0e1, 0x6802d0e1, 0x6002d0e1, 0x6002d0e1, 0x61001ced, 0x61001ced},
-- {0x0000a568, 0x7202b4c4, 0x7202b4c4, 0x6c02b4c4, 0x6c02b4c4, 0x6502b4c4, 0x6502b4c4, 0x660018d4, 0x660018d4},
-- {0x0000a56c, 0x75007894, 0x75007894, 0x70007894, 0x70007894, 0x6b007894, 0x6b007894, 0x660018d4, 0x660018d4},
-- {0x0000a570, 0x7b025c74, 0x7b025c74, 0x75025c74, 0x75025c74, 0x70025c74, 0x70025c74, 0x660018d4, 0x660018d4},
-- {0x0000a574, 0x8300bcb5, 0x8300bcb5, 0x7a00bcb5, 0x7a00bcb5, 0x7600bcb5, 0x7600bcb5, 0x660018d4, 0x660018d4},
-- {0x0000a578, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
-- {0x0000a57c, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
-+ {0x0000a518, 0x1700002b, 0x1700002b, 0x1700002b, 0x1700002b, 0x1600002b, 0x1600002b, 0x1700000e, 0x1700000e},
-+ {0x0000a51c, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1a00002d, 0x1a00002d, 0x1b000064, 0x1b000064},
-+ {0x0000a520, 0x20000031, 0x20000031, 0x1f000031, 0x1f000031, 0x1e000031, 0x1e000031, 0x1f000242, 0x1f000242},
-+ {0x0000a524, 0x24000051, 0x24000051, 0x23000051, 0x23000051, 0x23000051, 0x23000051, 0x23000229, 0x23000229},
-+ {0x0000a528, 0x27000071, 0x27000071, 0x27000071, 0x27000071, 0x26000071, 0x26000071, 0x270002a2, 0x270002a2},
-+ {0x0000a52c, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2c001203, 0x2c001203},
-+ {0x0000a530, 0x3000028c, 0x3000028c, 0x2f00028c, 0x2f00028c, 0x2e00028c, 0x2e00028c, 0x30001803, 0x30001803},
-+ {0x0000a534, 0x34000290, 0x34000290, 0x33000290, 0x33000290, 0x32000290, 0x32000290, 0x33000881, 0x33000881},
-+ {0x0000a538, 0x37000292, 0x37000292, 0x36000292, 0x36000292, 0x35000292, 0x35000292, 0x38001809, 0x38001809},
-+ {0x0000a53c, 0x3b02028d, 0x3b02028d, 0x3a02028d, 0x3a02028d, 0x3902028d, 0x3902028d, 0x3a000814, 0x3a000814},
-+ {0x0000a540, 0x3f020291, 0x3f020291, 0x3e020291, 0x3e020291, 0x3d020291, 0x3d020291, 0x3f001a0c, 0x3f001a0c},
-+ {0x0000a544, 0x44020490, 0x44020490, 0x43020490, 0x43020490, 0x42020490, 0x42020490, 0x43001a0e, 0x43001a0e},
-+ {0x0000a548, 0x48020492, 0x48020492, 0x47020492, 0x47020492, 0x46020492, 0x46020492, 0x46001812, 0x46001812},
-+ {0x0000a54c, 0x4c020692, 0x4c020692, 0x4b020692, 0x4b020692, 0x4a020692, 0x4a020692, 0x49001884, 0x49001884},
-+ {0x0000a550, 0x50020892, 0x50020892, 0x4f020892, 0x4f020892, 0x4e020892, 0x4e020892, 0x4d001e84, 0x4d001e84},
-+ {0x0000a554, 0x53040891, 0x53040891, 0x53040891, 0x53040891, 0x52040891, 0x52040891, 0x50001e69, 0x50001e69},
-+ {0x0000a558, 0x58040893, 0x58040893, 0x57040893, 0x57040893, 0x56040893, 0x56040893, 0x550006f4, 0x550006f4},
-+ {0x0000a55c, 0x5c0408b4, 0x5c0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x59000ad3, 0x59000ad3},
-+ {0x0000a560, 0x610408b6, 0x610408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e000ad5, 0x5e000ad5},
-+ {0x0000a564, 0x670408f6, 0x670408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x61001ced, 0x61001ced},
-+ {0x0000a568, 0x6a040cf6, 0x6a040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x660018d4, 0x660018d4},
-+ {0x0000a56c, 0x6d040d76, 0x6d040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x660018d4, 0x660018d4},
-+ {0x0000a570, 0x70060db6, 0x70060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x660018d4, 0x660018d4},
-+ {0x0000a574, 0x730a0df6, 0x730a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x660018d4, 0x660018d4},
-+ {0x0000a578, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
-+ {0x0000a57c, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
- {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
- {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
- {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-- {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03804000, 0x03804000},
-- {0x0000a610, 0x04c08c01, 0x04c08c01, 0x04808b01, 0x04808b01, 0x04808a01, 0x04808a01, 0x0300ca02, 0x0300ca02},
-- {0x0000a614, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00000e04, 0x00000e04},
-- {0x0000a618, 0x04010c01, 0x04010c01, 0x03c10b01, 0x03c10b01, 0x03810a01, 0x03810a01, 0x03014000, 0x03014000},
-- {0x0000a61c, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x00000000, 0x00000000},
-- {0x0000a620, 0x04010303, 0x04010303, 0x03c10303, 0x03c10303, 0x03810303, 0x03810303, 0x00000000, 0x00000000},
-- {0x0000a624, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03014000, 0x03014000},
-- {0x0000a628, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x03804c05, 0x03804c05},
-- {0x0000a62c, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x0701de06, 0x0701de06},
-- {0x0000a630, 0x03418000, 0x03418000, 0x03018000, 0x03018000, 0x02c18000, 0x02c18000, 0x07819c07, 0x07819c07},
-- {0x0000a634, 0x03815004, 0x03815004, 0x03414f04, 0x03414f04, 0x03414e04, 0x03414e04, 0x0701dc07, 0x0701dc07},
-- {0x0000a638, 0x03005302, 0x03005302, 0x02c05202, 0x02c05202, 0x02805202, 0x02805202, 0x0701dc07, 0x0701dc07},
-- {0x0000a63c, 0x04c09302, 0x04c09302, 0x04809202, 0x04809202, 0x04809202, 0x04809202, 0x0701dc07, 0x0701dc07},
-- {0x0000b2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-- {0x0000b2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-- {0x0000b2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
-+ {0x0000a60c, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x03804000, 0x03804000},
-+ {0x0000a610, 0x04008b01, 0x04008b01, 0x04008b01, 0x04008b01, 0x03c08b01, 0x03c08b01, 0x0300ca02, 0x0300ca02},
-+ {0x0000a614, 0x05811403, 0x05811403, 0x05411303, 0x05411303, 0x05411303, 0x05411303, 0x00000e04, 0x00000e04},
-+ {0x0000a618, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
-+ {0x0000a61c, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
-+ {0x0000a620, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
-+ {0x0000a624, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
-+ {0x0000a628, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03804c05, 0x03804c05},
-+ {0x0000a62c, 0x06815604, 0x06815604, 0x06415504, 0x06415504, 0x06015504, 0x06015504, 0x0701de06, 0x0701de06},
-+ {0x0000a630, 0x07819a05, 0x07819a05, 0x07419905, 0x07419905, 0x07019805, 0x07019805, 0x07819c07, 0x07819c07},
-+ {0x0000a634, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
-+ {0x0000a638, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
-+ {0x0000a63c, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
-+ {0x0000b2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
-+ {0x0000b2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
-+ {0x0000b2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
- {0x0000b2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
-- {0x0000c2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-- {0x0000c2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-- {0x0000c2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
-+ {0x0000c2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
-+ {0x0000c2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
-+ {0x0000c2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
- {0x0000c2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
- {0x00016044, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-- {0x00016048, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
-+ {0x00016048, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
- {0x00016280, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01808e84, 0x01808e84},
- {0x00016444, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-- {0x00016448, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
-+ {0x00016448, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
- {0x00016844, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-- {0x00016848, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
-+ {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
- };
- static const u32 ar955x_1p0_mac_core[][2] = {
-@@ -846,7 +846,7 @@ static const u32 ar955x_1p0_baseband_cor
- {0x0000a44c, 0x00000001},
- {0x0000a450, 0x00010000},
- {0x0000a458, 0x00000000},
-- {0x0000a644, 0x3fad9d74},
-+ {0x0000a644, 0xbfad9d74},
- {0x0000a648, 0x0048060a},
- {0x0000a64c, 0x00003c37},
- {0x0000a670, 0x03020100},
-@@ -1277,7 +1277,7 @@ static const u32 ar955x_1p0_modes_fast_c
- {0x0000801c, 0x148ec02b, 0x148ec057},
- {0x00008318, 0x000044c0, 0x00008980},
- {0x00009e00, 0x0372131c, 0x0372131c},
-- {0x0000a230, 0x0000000b, 0x00000016},
-+ {0x0000a230, 0x0000400b, 0x00004016},
- {0x0000a254, 0x00000898, 0x00001130},
- };
+@@ -412,12 +425,16 @@ minstrel_rate_init(void *priv, struct ie
+ unsigned int i, n = 0;
+ unsigned int t_slot = 9; /* FIXME: get real slot time */
---- a/drivers/net/wireless/ath/ath9k/htc_hst.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
-@@ -347,6 +347,8 @@ void ath9k_htc_txcompletion_cb(struct ht
- endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
- skb, htc_hdr->endpoint_id,
- txok);
-+ } else {
-+ kfree_skb(skb);
- }
++ mi->sta = sta;
+ mi->lowest_rix = rate_lowest_index(sband, sta);
+ ctl_rate = &sband->bitrates[mi->lowest_rix];
+ mi->sp_ack_dur = ieee80211_frame_duration(sband->band, 10,
+ ctl_rate->bitrate,
+ !!(ctl_rate->flags & IEEE80211_RATE_ERP_G), 1);
+
++ memset(mi->max_tp_rate, 0, sizeof(mi->max_tp_rate));
++ mi->max_prob_rate = 0;
++
+ for (i = 0; i < sband->n_bitrates; i++) {
+ struct minstrel_rate *mr = &mi->r[n];
+ unsigned int tx_time = 0, tx_time_cts = 0, tx_time_rtscts = 0;
+@@ -460,6 +477,8 @@ minstrel_rate_init(void *priv, struct ie
+ } while ((tx_time < mp->segment_size) &&
+ (++mr->retry_count < mp->max_retry));
+ mr->adjusted_retry_count = mr->retry_count;
++ if (!(sband->bitrates[i].flags & IEEE80211_RATE_ERP_G))
++ mr->retry_count_cts = mr->retry_count;
}
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -142,8 +142,8 @@ static void rcu_free_regdom(const struct
+ for (i = n; i < sband->n_bitrates; i++) {
+@@ -471,6 +490,7 @@ minstrel_rate_init(void *priv, struct ie
+ mi->stats_update = jiffies;
- static struct regulatory_request *get_last_request(void)
- {
-- return rcu_dereference_protected(last_request,
-- lockdep_is_held(®_mutex));
-+ return rcu_dereference_check(last_request,
-+ lockdep_is_held(®_mutex));
+ init_sample_table(mi);
++ minstrel_update_rates(mp, mi);
}
- /* Used to queue up regulatory hints */
-@@ -1125,7 +1125,9 @@ static bool is_ht40_allowed(struct ieee8
- if (chan->flags & IEEE80211_CHAN_DISABLED)
- return false;
- /* This would happen when regulatory rules disallow HT40 completely */
-- return !(chan->flags & IEEE80211_CHAN_NO_HT40);
-+ if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40)
-+ return false;
-+ return true;
+ static void *
+--- a/net/mac80211/rc80211_minstrel.h
++++ b/net/mac80211/rc80211_minstrel.h
+@@ -9,7 +9,8 @@
+ #ifndef __RC_MINSTREL_H
+ #define __RC_MINSTREL_H
+
+-#define EWMA_LEVEL 75 /* ewma weighting factor [%] */
++#define EWMA_LEVEL 96 /* ewma weighting factor [/EWMA_DIV] */
++#define EWMA_DIV 128
+ #define SAMPLE_COLUMNS 10 /* number of columns in sample table */
+
+
+@@ -27,7 +28,7 @@
+ static inline int
+ minstrel_ewma(int old, int new, int weight)
+ {
+- return (new * (100 - weight) + old * weight) / 100;
++ return (new * (EWMA_DIV - weight) + old * weight) / EWMA_DIV;
}
- static void reg_process_ht_flags_channel(struct wiphy *wiphy,
-@@ -1850,7 +1852,7 @@ static void restore_regulatory_settings(
- mutex_lock(&cfg80211_mutex);
- mutex_lock(®_mutex);
-- reset_regdomains(true, cfg80211_world_regdom);
-+ reset_regdomains(true, &world_regdom);
- restore_alpha2(alpha2, reset_user);
+@@ -62,6 +63,8 @@ struct minstrel_rate {
+ };
- /*
-@@ -2251,14 +2253,21 @@ int set_regdom(const struct ieee80211_re
+ struct minstrel_sta_info {
++ struct ieee80211_sta *sta;
++
+ unsigned long stats_update;
+ unsigned int sp_ack_dur;
+ unsigned int rate_avg;
+--- a/net/mac80211/rc80211_minstrel_debugfs.c
++++ b/net/mac80211/rc80211_minstrel_debugfs.c
+@@ -68,7 +68,7 @@ minstrel_stats_open(struct inode *inode,
- int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
- {
-- struct regulatory_request *lr = get_last_request();
-+ struct regulatory_request *lr;
-+ u8 alpha2[2];
-+ bool add = false;
+ file->private_data = ms;
+ p = ms->buf;
+- p += sprintf(p, "rate throughput ewma prob this prob "
++ p += sprintf(p, "rate throughput ewma prob this prob "
+ "this succ/attempt success attempts\n");
+ for (i = 0; i < mi->n_rates; i++) {
+ struct minstrel_rate *mr = &mi->r[i];
+@@ -86,7 +86,7 @@ minstrel_stats_open(struct inode *inode,
+ eprob = MINSTREL_TRUNC(mr->probability * 1000);
+
+ p += sprintf(p, " %6u.%1u %6u.%1u %6u.%1u "
+- "%3u(%3u) %8llu %8llu\n",
++ " %3u(%3u) %8llu %8llu\n",
+ tp / 10, tp % 10,
+ eprob / 10, eprob % 10,
+ prob / 10, prob % 10,
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -126,6 +126,9 @@ const struct mcs_group minstrel_mcs_grou
-+ rcu_read_lock();
-+ lr = get_last_request();
- if (lr && !lr->processed) {
-- if (add_uevent_var(env, "COUNTRY=%c%c",
-- lr->alpha2[0], lr->alpha2[1]))
-- return -ENOMEM;
-+ memcpy(alpha2, lr->alpha2, 2);
-+ add = true;
- }
-+ rcu_read_unlock();
+ static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES];
-+ if (add)
-+ return add_uevent_var(env, "COUNTRY=%c%c",
-+ alpha2[0], alpha2[1]);
- return 0;
- }
++static void
++minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi);
++
+ /*
+ * Look up an MCS group index based on mac80211 rate information
+ */
+@@ -244,6 +247,7 @@ minstrel_ht_update_stats(struct minstrel
+ struct minstrel_rate_stats *mr;
+ int cur_prob, cur_prob_tp, cur_tp, cur_tp2;
+ int group, i, index;
++ bool mi_rates_valid = false;
+
+ if (mi->ampdu_packets > 0) {
+ mi->avg_ampdu_len = minstrel_ewma(mi->avg_ampdu_len,
+@@ -254,11 +258,10 @@ minstrel_ht_update_stats(struct minstrel
+
+ mi->sample_slow = 0;
+ mi->sample_count = 0;
+- mi->max_tp_rate = 0;
+- mi->max_tp_rate2 = 0;
+- mi->max_prob_rate = 0;
+
+ for (group = 0; group < ARRAY_SIZE(minstrel_mcs_groups); group++) {
++ bool mg_rates_valid = false;
++
+ cur_prob = 0;
+ cur_prob_tp = 0;
+ cur_tp = 0;
+@@ -268,15 +271,24 @@ minstrel_ht_update_stats(struct minstrel
+ if (!mg->supported)
+ continue;
+
+- mg->max_tp_rate = 0;
+- mg->max_tp_rate2 = 0;
+- mg->max_prob_rate = 0;
+ mi->sample_count++;
+
+ for (i = 0; i < MCS_GROUP_RATES; i++) {
+ if (!(mg->supported & BIT(i)))
+ continue;
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -967,7 +967,7 @@ static bool ar9003_hw_init_cal(struct at
- struct ath9k_hw_cal_data *caldata = ah->caldata;
- bool txiqcal_done = false, txclcal_done = false;
- bool is_reusable = true, status = true;
-- bool run_rtt_cal = false, run_agc_cal;
-+ bool run_rtt_cal = false, run_agc_cal, sep_iq_cal = false;
- bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
- u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
- AR_PHY_AGC_CONTROL_FLTR_CAL |
-@@ -977,6 +977,8 @@ static bool ar9003_hw_init_cal(struct at
- AR_PHY_CL_TAB_1,
- AR_PHY_CL_TAB_2 };
-
-+ ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
-+
- if (rtt) {
- if (!ar9003_hw_rtt_restore(ah, chan))
- run_rtt_cal = true;
-@@ -1013,7 +1015,8 @@ static bool ar9003_hw_init_cal(struct at
- }
- }
++ /* initialize rates selections starting indexes */
++ if (!mg_rates_valid) {
++ mg->max_tp_rate = mg->max_tp_rate2 =
++ mg->max_prob_rate = i;
++ if (!mi_rates_valid) {
++ mi->max_tp_rate = mi->max_tp_rate2 =
++ mi->max_prob_rate = i;
++ mi_rates_valid = true;
++ }
++ mg_rates_valid = true;
++ }
++
+ mr = &mg->rates[i];
+ mr->retry_updated = false;
+ index = MCS_GROUP_RATES * group + i;
+@@ -456,7 +468,7 @@ minstrel_ht_tx_status(void *priv, struct
+ struct ieee80211_tx_rate *ar = info->status.rates;
+ struct minstrel_rate_stats *rate, *rate2;
+ struct minstrel_priv *mp = priv;
+- bool last;
++ bool last, update = false;
+ int i;
-- if (!(ah->enabled_cals & TX_IQ_CAL))
-+ if ((IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan)) ||
-+ !(ah->enabled_cals & TX_IQ_CAL))
- goto skip_tx_iqcal;
-
- /* Do Tx IQ Calibration */
-@@ -1033,21 +1036,22 @@ static bool ar9003_hw_init_cal(struct at
- REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
- AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
- txiqcal_done = run_agc_cal = true;
-- goto skip_tx_iqcal;
-- } else if (caldata && !caldata->done_txiqcal_once)
-+ } else if (caldata && !caldata->done_txiqcal_once) {
- run_agc_cal = true;
-+ sep_iq_cal = true;
+ if (!msp->is_ht)
+@@ -505,21 +517,29 @@ minstrel_ht_tx_status(void *priv, struct
+ rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
+ if (rate->attempts > 30 &&
+ MINSTREL_FRAC(rate->success, rate->attempts) <
+- MINSTREL_FRAC(20, 100))
++ MINSTREL_FRAC(20, 100)) {
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
++ update = true;
+ }
-+skip_tx_iqcal:
- if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
- ar9003_mci_init_cal_req(ah, &is_reusable);
+ rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);
+ if (rate2->attempts > 30 &&
+ MINSTREL_FRAC(rate2->success, rate2->attempts) <
+- MINSTREL_FRAC(20, 100))
++ MINSTREL_FRAC(20, 100)) {
+ minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
++ update = true;
++ }
-- if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
-+ if (sep_iq_cal) {
- txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
- REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
- udelay(5);
- REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+ if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
++ update = true;
+ minstrel_ht_update_stats(mp, mi);
+ if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
+ mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
+ minstrel_aggr_check(sta, skb);
}
++
++ if (update)
++ minstrel_ht_update_rates(mp, mi);
+ }
--skip_tx_iqcal:
- if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
- /* Calibrate the AGC */
- REG_WRITE(ah, AR_PHY_AGC_CONTROL,
---- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-@@ -744,6 +744,186 @@ static const u32 ar9300Modes_high_ob_db_
- {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
- };
+ static void
+@@ -580,39 +600,73 @@ minstrel_calc_retransmit(struct minstrel
+ (++mr->retry_count < mp->max_retry));
+ }
-+static const u32 ar9300Modes_mixed_ob_db_tx_gain_table_2p2[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-+ {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-+ {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+ {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+ {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
-+ {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
-+ {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-+ {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
-+ {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
-+ {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
-+ {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x26000a20, 0x26000a20},
-+ {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2a000e20, 0x2a000e20},
-+ {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
-+ {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
-+ {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
-+ {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
-+ {0x0000a544, 0x52022470, 0x52022470, 0x3b001861, 0x3b001861},
-+ {0x0000a548, 0x55022490, 0x55022490, 0x3e001a81, 0x3e001a81},
-+ {0x0000a54c, 0x59022492, 0x59022492, 0x42001a83, 0x42001a83},
-+ {0x0000a550, 0x5d022692, 0x5d022692, 0x44001c84, 0x44001c84},
-+ {0x0000a554, 0x61022892, 0x61022892, 0x48001ce3, 0x48001ce3},
-+ {0x0000a558, 0x65024890, 0x65024890, 0x4c001ce5, 0x4c001ce5},
-+ {0x0000a55c, 0x69024892, 0x69024892, 0x50001ce9, 0x50001ce9},
-+ {0x0000a560, 0x6e024c92, 0x6e024c92, 0x54001ceb, 0x54001ceb},
-+ {0x0000a564, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a568, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a56c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a570, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a574, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a578, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a57c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
-+ {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+ {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+ {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+ {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+ {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+ {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
-+ {0x0000a598, 0x21802220, 0x21802220, 0x15800402, 0x15800402},
-+ {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-+ {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
-+ {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
-+ {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
-+ {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
-+ {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
-+ {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
-+ {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
-+ {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
-+ {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
-+ {0x0000a5c4, 0x52822470, 0x52822470, 0x3b801861, 0x3b801861},
-+ {0x0000a5c8, 0x55822490, 0x55822490, 0x3e801a81, 0x3e801a81},
-+ {0x0000a5cc, 0x59822492, 0x59822492, 0x42801a83, 0x42801a83},
-+ {0x0000a5d0, 0x5d822692, 0x5d822692, 0x44801c84, 0x44801c84},
-+ {0x0000a5d4, 0x61822892, 0x61822892, 0x48801ce3, 0x48801ce3},
-+ {0x0000a5d8, 0x65824890, 0x65824890, 0x4c801ce5, 0x4c801ce5},
-+ {0x0000a5dc, 0x69824892, 0x69824892, 0x50801ce9, 0x50801ce9},
-+ {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x54801ceb, 0x54801ceb},
-+ {0x0000a5e4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5e8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5ec, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5f0, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5f4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5f8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a5fc, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
-+ {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
-+ {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
-+ {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
-+ {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
-+ {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-+ {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-+ {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-+ {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-+ {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-+ {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-+ {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-+ {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-+ {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-+ {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+ {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x00016044, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
-+ {0x00016048, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
-+ {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016444, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
-+ {0x00016448, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
-+ {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016844, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
-+ {0x00016848, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
-+ {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
+-
+ static void
+ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
+- struct ieee80211_tx_rate *rate, int index,
+- bool sample, bool rtscts)
++ struct ieee80211_sta_rates *ratetbl, int offset, int index)
+ {
+ const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
+ struct minstrel_rate_stats *mr;
++ u8 idx;
++ u16 flags;
+
+ mr = minstrel_get_ratestats(mi, index);
+ if (!mr->retry_updated)
+ minstrel_calc_retransmit(mp, mi, index);
+
+- if (sample)
+- rate->count = 1;
+- else if (mr->probability < MINSTREL_FRAC(20, 100))
+- rate->count = 2;
+- else if (rtscts)
+- rate->count = mr->retry_count_rtscts;
+- else
+- rate->count = mr->retry_count;
+-
+- rate->flags = 0;
+- if (rtscts)
+- rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS;
++ if (mr->probability < MINSTREL_FRAC(20, 100) || !mr->retry_count) {
++ ratetbl->rate[offset].count = 2;
++ ratetbl->rate[offset].count_rts = 2;
++ ratetbl->rate[offset].count_cts = 2;
++ } else {
++ ratetbl->rate[offset].count = mr->retry_count;
++ ratetbl->rate[offset].count_cts = mr->retry_count;
++ ratetbl->rate[offset].count_rts = mr->retry_count_rtscts;
++ }
+
+ if (index / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
+- rate->idx = mp->cck_rates[index % ARRAY_SIZE(mp->cck_rates)];
++ idx = mp->cck_rates[index % ARRAY_SIZE(mp->cck_rates)];
++ flags = 0;
++ } else {
++ idx = index % MCS_GROUP_RATES +
++ (group->streams - 1) * MCS_GROUP_RATES;
++ flags = IEEE80211_TX_RC_MCS | group->flags;
++ }
+
-+static const u32 ar9300Modes_type5_tx_gain_table_2p2[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+ {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
-+ {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
-+ {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
-+ {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
-+ {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
-+ {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
-+ {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
-+ {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
-+ {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
-+ {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
-+ {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
-+ {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
-+ {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
-+ {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
-+ {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
-+ {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
-+ {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
-+ {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
-+ {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
-+ {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
-+ {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
-+ {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
-+ {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
-+ {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
-+ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-+ {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
-+ {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016048, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
-+ {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016448, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
-+ {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016848, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
-+ {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
++ if (offset > 0) {
++ ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts;
++ flags |= IEEE80211_TX_RC_USE_RTS_CTS;
++ }
+
- static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
- /* Addr allmodes */
- {0x0000a000, 0x00010000},
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -507,28 +507,59 @@ static void ar9003_tx_gain_table_mode4(s
- else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9580_1p0_mixed_ob_db_tx_gain_table);
-+ else
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
++ ratetbl->rate[offset].idx = idx;
++ ratetbl->rate[offset].flags = flags;
+}
+
-+static void ar9003_tx_gain_table_mode5(struct ath_hw *ah)
++static void
++minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
+{
-+ if (AR_SREV_9485_11(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9485Modes_green_ob_db_tx_gain_1_1);
-+ else if (AR_SREV_9340(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9340Modes_ub124_tx_gain_table_1p0);
-+ else if (AR_SREV_9580(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9580_1p0_type5_tx_gain_table);
-+ else if (AR_SREV_9300_22(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9300Modes_type5_tx_gain_table_2p2);
-+}
++ struct ieee80211_sta_rates *rates;
++ int i = 0;
+
-+static void ar9003_tx_gain_table_mode6(struct ath_hw *ah)
-+{
-+ if (AR_SREV_9340(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0);
-+ else if (AR_SREV_9485_11(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9485Modes_green_spur_ob_db_tx_gain_1_1);
-+ else if (AR_SREV_9580(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9580_1p0_type6_tx_gain_table);
++ rates = kzalloc(sizeof(*rates), GFP_ATOMIC);
++ if (!rates)
+ return;
++
++ /* Start with max_tp_rate */
++ minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_tp_rate);
++
++ if (mp->hw->max_rates >= 3) {
++ /* At least 3 tx rates supported, use max_tp_rate2 next */
++ minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_tp_rate2);
++ }
++
++ if (mp->hw->max_rates >= 2) {
++ /*
++ * At least 2 tx rates supported, use max_prob_rate next */
++ minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_prob_rate);
+ }
+
+- rate->flags |= IEEE80211_TX_RC_MCS | group->flags;
+- rate->idx = index % MCS_GROUP_RATES + (group->streams - 1) * MCS_GROUP_RATES;
++ rates->rate[i].idx = -1;
++ rate_control_set_rates(mp->hw, mi->sta, rates);
}
-+typedef void (*ath_txgain_tab)(struct ath_hw *ah);
-+
- static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
+ static inline int
+@@ -702,13 +756,13 @@ static void
+ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
+ struct ieee80211_tx_rate_control *txrc)
{
-- switch (ar9003_hw_get_tx_gain_idx(ah)) {
-- case 0:
-- default:
-- ar9003_tx_gain_table_mode0(ah);
-- break;
-- case 1:
-- ar9003_tx_gain_table_mode1(ah);
-- break;
-- case 2:
-- ar9003_tx_gain_table_mode2(ah);
-- break;
-- case 3:
-- ar9003_tx_gain_table_mode3(ah);
-- break;
-- case 4:
-- ar9003_tx_gain_table_mode4(ah);
-- break;
-- }
-+ static const ath_txgain_tab modes[] = {
-+ ar9003_tx_gain_table_mode0,
-+ ar9003_tx_gain_table_mode1,
-+ ar9003_tx_gain_table_mode2,
-+ ar9003_tx_gain_table_mode3,
-+ ar9003_tx_gain_table_mode4,
-+ ar9003_tx_gain_table_mode5,
-+ ar9003_tx_gain_table_mode6,
-+ };
-+ int idx = ar9003_hw_get_tx_gain_idx(ah);
-+
-+ if (idx >= ARRAY_SIZE(modes))
-+ idx = 0;
-+
-+ modes[idx](ah);
- }
-
- static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
-@@ -673,7 +704,7 @@ void ar9003_hw_attach_ops(struct ath_hw
- struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
- struct ath_hw_ops *ops = ath9k_hw_ops(ah);
-
-- priv_ops->init_mode_regs = ar9003_hw_init_mode_regs;
-+ ar9003_hw_init_mode_regs(ah);
- priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
-
- ops->config_pci_powersave = ar9003_hw_configpcipowersave;
---- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-@@ -1172,6 +1172,106 @@ static const u32 ar9340Modes_mixed_ob_db
- {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
- };
++ const struct mcs_group *sample_group;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
+- struct ieee80211_tx_rate *ar = info->status.rates;
++ struct ieee80211_tx_rate *rate = &info->status.rates[0];
+ struct minstrel_ht_sta_priv *msp = priv_sta;
+ struct minstrel_ht_sta *mi = &msp->ht;
+ struct minstrel_priv *mp = priv;
+ int sample_idx;
+- bool sample = false;
-+static const u32 ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
-+ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
-+ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
-+ {0x0000a394, 0x00000444, 0x00000444, 0x00000404, 0x00000404},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x02000001, 0x02000001},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x05000003, 0x05000003},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0a000005, 0x0a000005},
-+ {0x0000a510, 0x16000220, 0x16000220, 0x0e000201, 0x0e000201},
-+ {0x0000a514, 0x1c000223, 0x1c000223, 0x11000203, 0x11000203},
-+ {0x0000a518, 0x21002220, 0x21002220, 0x14000401, 0x14000401},
-+ {0x0000a51c, 0x27002223, 0x27002223, 0x18000403, 0x18000403},
-+ {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000602, 0x1b000602},
-+ {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000802, 0x1f000802},
-+ {0x0000a528, 0x34022225, 0x34022225, 0x21000620, 0x21000620},
-+ {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x25000820, 0x25000820},
-+ {0x0000a530, 0x3e02222c, 0x3e02222c, 0x29000822, 0x29000822},
-+ {0x0000a534, 0x4202242a, 0x4202242a, 0x2d000824, 0x2d000824},
-+ {0x0000a538, 0x4702244a, 0x4702244a, 0x30000828, 0x30000828},
-+ {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x3400082a, 0x3400082a},
-+ {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38000849, 0x38000849},
-+ {0x0000a544, 0x5302266c, 0x5302266c, 0x3b000a2c, 0x3b000a2c},
-+ {0x0000a548, 0x5702286c, 0x5702286c, 0x3e000e2b, 0x3e000e2b},
-+ {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42000e2d, 0x42000e2d},
-+ {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4500124a, 0x4500124a},
-+ {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4900124c, 0x4900124c},
-+ {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c00126c, 0x4c00126c},
-+ {0x0000a55c, 0x7002708c, 0x7002708c, 0x4f00128c, 0x4f00128c},
-+ {0x0000a560, 0x7302b08a, 0x7302b08a, 0x52001290, 0x52001290},
-+ {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
-+ {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+ {0x0000a584, 0x06800003, 0x06800003, 0x02800001, 0x02800001},
-+ {0x0000a588, 0x0a800020, 0x0a800020, 0x05800003, 0x05800003},
-+ {0x0000a58c, 0x10800023, 0x10800023, 0x0a800005, 0x0a800005},
-+ {0x0000a590, 0x16800220, 0x16800220, 0x0e800201, 0x0e800201},
-+ {0x0000a594, 0x1c800223, 0x1c800223, 0x11800203, 0x11800203},
-+ {0x0000a598, 0x21820220, 0x21820220, 0x14800401, 0x14800401},
-+ {0x0000a59c, 0x27820223, 0x27820223, 0x18800403, 0x18800403},
-+ {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800602, 0x1b800602},
-+ {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800802, 0x1f800802},
-+ {0x0000a5a8, 0x34822225, 0x34822225, 0x21800620, 0x21800620},
-+ {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x25800820, 0x25800820},
-+ {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x29800822, 0x29800822},
-+ {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2d800824, 0x2d800824},
-+ {0x0000a5b8, 0x4782244a, 0x4782244a, 0x30800828, 0x30800828},
-+ {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x3480082a, 0x3480082a},
-+ {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38800849, 0x38800849},
-+ {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b800a2c, 0x3b800a2c},
-+ {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e800e2b, 0x3e800e2b},
-+ {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42800e2d, 0x42800e2d},
-+ {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4580124a, 0x4580124a},
-+ {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4980124c, 0x4980124c},
-+ {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c80126c, 0x4c80126c},
-+ {0x0000a5dc, 0x7086308c, 0x7086308c, 0x4f80128c, 0x4f80128c},
-+ {0x0000a5e0, 0x738a308a, 0x738a308a, 0x52801290, 0x52801290},
-+ {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a614, 0x01404000, 0x01404000, 0x01404501, 0x01404501},
-+ {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x02008802, 0x02008802, 0x01404501, 0x01404501},
-+ {0x0000a620, 0x0300cc03, 0x0300cc03, 0x03c0cf02, 0x03c0cf02},
-+ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03c0cf03, 0x03c0cf03},
-+ {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04011004, 0x04011004},
-+ {0x0000a62c, 0x03810c03, 0x03810c03, 0x05419405, 0x05419405},
-+ {0x0000a630, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a634, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a638, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000a63c, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
-+ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
-+ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
-+ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
-+ {0x00016044, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
-+ {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
-+ {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
-+ {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
-+ {0x00016444, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
-+ {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
-+};
-+
- static const u32 ar9340_1p0_mac_core[][2] = {
- /* Addr allmodes */
- {0x00000008, 0x00000000},
---- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-@@ -260,6 +260,79 @@ static const u32 ar9485Modes_high_power_
- {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
- };
+ if (rate_control_send_low(sta, priv_sta, txrc))
+ return;
+@@ -736,51 +790,6 @@ minstrel_ht_get_rate(void *priv, struct
+ }
+ #endif
-+static const u32 ar9485Modes_green_ob_db_tx_gain_1_1[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-+ {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-+ {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-+ {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-+ {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
-+ {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-+ {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-+ {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-+ {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
-+ {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
-+ {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
-+ {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
-+ {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
-+ {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
-+ {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
-+ {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
-+ {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-+ {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-+ {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-+ {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-+ {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-+ {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-+ {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-+ {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-+ {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-+ {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-+ {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-+ {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-+ {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-+ {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-+ {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-+};
-+
- static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-@@ -450,6 +523,79 @@ static const u32 ar9485Modes_low_ob_db_t
-
- #define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
-
-+static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-+ {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-+ {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-+ {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-+ {0x0000a508, 0x0c002e00, 0x0c002e00, 0x07000203, 0x07000203},
-+ {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-+ {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-+ {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-+ {0x0000a518, 0x25020ec0, 0x25020ec0, 0x14000406, 0x14000406},
-+ {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1800040a, 0x1800040a},
-+ {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000460, 0x1c000460},
-+ {0x0000a524, 0x35001fc4, 0x35001fc4, 0x22000463, 0x22000463},
-+ {0x0000a528, 0x3c022f04, 0x3c022f04, 0x26000465, 0x26000465},
-+ {0x0000a52c, 0x41023e85, 0x41023e85, 0x2e0006e0, 0x2e0006e0},
-+ {0x0000a530, 0x48023ec6, 0x48023ec6, 0x310006e0, 0x310006e0},
-+ {0x0000a534, 0x4d023f01, 0x4d023f01, 0x330006e0, 0x330006e0},
-+ {0x0000a538, 0x53023f4b, 0x53023f4b, 0x3e0008e3, 0x3e0008e3},
-+ {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x410008e5, 0x410008e5},
-+ {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x430008e6, 0x430008e6},
-+ {0x0000a544, 0x6502feca, 0x6502feca, 0x4a0008ec, 0x4a0008ec},
-+ {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4e0008f1, 0x4e0008f1},
-+ {0x0000a54c, 0x7203feca, 0x7203feca, 0x520008f3, 0x520008f3},
-+ {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x54000eed, 0x54000eed},
-+ {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x58000ef1, 0x58000ef1},
-+ {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5c000ef3, 0x5c000ef3},
-+ {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x60000ef5, 0x60000ef5},
-+ {0x0000a560, 0x900fff0b, 0x900fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a564, 0x960fffcb, 0x960fffcb, 0x62000ef6, 0x62000ef6},
-+ {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
-+ {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-+ {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-+ {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-+ {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-+ {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-+ {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-+ {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-+};
-+
- static const u32 ar9485_1_1[][2] = {
- /* Addr allmodes */
- {0x0000a580, 0x00000000},
---- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
-@@ -685,6 +685,82 @@ static const u32 ar9580_1p0_mixed_ob_db_
-
- #define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
-
-+#define ar9580_1p0_type5_tx_gain_table ar9300Modes_type5_tx_gain_table_2p2
-+
-+static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
-+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
-+ {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+ {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+ {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+ {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+ {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
-+ {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
-+ {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
-+ {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
-+ {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
-+ {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
-+ {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
-+ {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
-+ {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
-+ {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
-+ {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
-+ {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
-+ {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
-+ {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
-+ {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
-+ {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
-+ {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
-+ {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
-+ {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
-+ {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
-+ {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
-+ {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
-+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+ {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
-+ {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
-+ {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
-+ {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
-+ {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
-+ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-+ {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
-+ {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
-+ {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
-+ {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
-+ {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
-+ {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-+ {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+ {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+ {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
-+ {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
- static const u32 ar9580_1p0_soc_preamble[][2] = {
- /* Addr allmodes */
- {0x000040a4, 0x00a0c1c9},
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -789,6 +789,7 @@
- #define AR_SREV_REVISION_9271_11 1
- #define AR_SREV_VERSION_9300 0x1c0
- #define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */
-+#define AR_SREV_REVISION_9300_22 3
- #define AR_SREV_VERSION_9330 0x200
- #define AR_SREV_REVISION_9330_10 0
- #define AR_SREV_REVISION_9330_11 1
-@@ -869,6 +870,9 @@
- (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
- #define AR_SREV_9300_20_OR_LATER(_ah) \
- ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
-+#define AR_SREV_9300_22(_ah) \
-+ (AR_SREV_9300(ah) && \
-+ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22))
-
- #define AR_SREV_9330(_ah) \
- (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct
- case NL80211_CHAN_WIDTH_40:
- if (sdata->vif.bss_conf.chandef.chan->center_freq >
- sdata->vif.bss_conf.chandef.center_freq1 &&
-- chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
-+ chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
- disable_40 = true;
- if (sdata->vif.bss_conf.chandef.chan->center_freq <
- sdata->vif.bss_conf.chandef.center_freq1 &&
-- chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
-+ chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
- disable_40 = true;
- break;
- default:
---- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-@@ -18,6 +18,7 @@
- #include "hw-ops.h"
- #include "../regd.h"
- #include "ar9002_phy.h"
-+#include "ar5008_initvals.h"
-
- /* All code below is for AR5008, AR9001, AR9002 */
-
-@@ -43,23 +44,16 @@ static const int m2ThreshLowExt_off = 12
- static const int m1ThreshExt_off = 127;
- static const int m2ThreshExt_off = 127;
-
-+static const struct ar5416IniArray bank0 = STATIC_INI_ARRAY(ar5416Bank0);
-+static const struct ar5416IniArray bank1 = STATIC_INI_ARRAY(ar5416Bank1);
-+static const struct ar5416IniArray bank2 = STATIC_INI_ARRAY(ar5416Bank2);
-+static const struct ar5416IniArray bank3 = STATIC_INI_ARRAY(ar5416Bank3);
-+static const struct ar5416IniArray bank7 = STATIC_INI_ARRAY(ar5416Bank7);
-
--static void ar5008_rf_bank_setup(u32 *bank, struct ar5416IniArray *array,
-- int col)
--{
-- int i;
+- if (sample_idx >= 0) {
+- sample = true;
+- minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx,
+- true, false);
+- info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
+- } else {
+- minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate,
+- false, false);
+- }
-
-- for (i = 0; i < array->ia_rows; i++)
-- bank[i] = INI_RA(array, i, col);
--}
+- if (mp->hw->max_rates >= 3) {
+- /*
+- * At least 3 tx rates supported, use
+- * sample_rate -> max_tp_rate -> max_prob_rate for sampling and
+- * max_tp_rate -> max_tp_rate2 -> max_prob_rate by default.
+- */
+- if (sample_idx >= 0)
+- minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate,
+- false, false);
+- else
+- minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate2,
+- false, true);
-
+- minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate,
+- false, !sample);
-
--#define REG_WRITE_RF_ARRAY(iniarray, regData, regWr) \
-- ar5008_write_rf_array(ah, iniarray, regData, &(regWr))
+- ar[3].count = 0;
+- ar[3].idx = -1;
+- } else if (mp->hw->max_rates == 2) {
+- /*
+- * Only 2 tx rates supported, use
+- * sample_rate -> max_prob_rate for sampling and
+- * max_tp_rate -> max_prob_rate by default.
+- */
+- minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_prob_rate,
+- false, !sample);
-
--static void ar5008_write_rf_array(struct ath_hw *ah, struct ar5416IniArray *array,
-- u32 *data, unsigned int *writecnt)
-+static void ar5008_write_bank6(struct ath_hw *ah, unsigned int *writecnt)
- {
-+ struct ar5416IniArray *array = &ah->iniBank6;
-+ u32 *data = ah->analogBank6Data;
- int r;
-
- ENABLE_REGWRITE_BUFFER(ah);
-@@ -165,7 +159,7 @@ static void ar5008_hw_force_bias(struct
- ar5008_hw_phy_modify_rx_buffer(ah->analogBank6Data, tmp_reg, 3, 181, 3);
-
- /* write Bank 6 with new params */
-- REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, reg_writes);
-+ ar5008_write_bank6(ah, ®_writes);
- }
-
- /**
-@@ -469,31 +463,16 @@ static void ar5008_hw_spur_mitigate(stru
- */
- static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
- {
--#define ATH_ALLOC_BANK(bank, size) do { \
-- bank = devm_kzalloc(ah->dev, sizeof(u32) * size, GFP_KERNEL); \
-- if (!bank) \
-- goto error; \
-- } while (0);
+- ar[2].count = 0;
+- ar[2].idx = -1;
+- } else {
+- /* Not using MRR, only use the first rate */
+- ar[1].count = 0;
+- ar[1].idx = -1;
+- }
-
-- struct ath_common *common = ath9k_hw_common(ah);
-+ int size = ah->iniBank6.ia_rows * sizeof(u32);
-
- if (AR_SREV_9280_20_OR_LATER(ah))
- return 0;
-
-- ATH_ALLOC_BANK(ah->analogBank0Data, ah->iniBank0.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank1Data, ah->iniBank1.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank2Data, ah->iniBank2.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank3Data, ah->iniBank3.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
-- ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
-- ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
-+ ah->analogBank6Data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
-+ if (!ah->analogBank6Data)
-+ return -ENOMEM;
+ mi->total_packets++;
- return 0;
--#undef ATH_ALLOC_BANK
--error:
-- ath_err(common, "Cannot allocate RF banks\n");
-- return -ENOMEM;
+ /* wraparound */
+@@ -788,6 +797,16 @@ minstrel_ht_get_rate(void *priv, struct
+ mi->total_packets = 0;
+ mi->sample_packets = 0;
+ }
++
++ if (sample_idx < 0)
++ return;
++
++ sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];
++ info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
++ rate->idx = sample_idx % MCS_GROUP_RATES +
++ (sample_group->streams - 1) * MCS_GROUP_RATES;
++ rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;
++ rate->count = 1;
}
+ static void
+@@ -837,6 +856,8 @@ minstrel_ht_update_caps(void *priv, stru
-@@ -517,6 +496,7 @@ static bool ar5008_hw_set_rf_regs(struct
- u32 ob5GHz = 0, db5GHz = 0;
- u32 ob2GHz = 0, db2GHz = 0;
- int regWrites = 0;
-+ int i;
-
- /*
- * Software does not need to program bank data
-@@ -529,25 +509,8 @@ static bool ar5008_hw_set_rf_regs(struct
- /* Setup rf parameters */
- eepMinorRev = ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV);
-
-- /* Setup Bank 0 Write */
-- ar5008_rf_bank_setup(ah->analogBank0Data, &ah->iniBank0, 1);
--
-- /* Setup Bank 1 Write */
-- ar5008_rf_bank_setup(ah->analogBank1Data, &ah->iniBank1, 1);
--
-- /* Setup Bank 2 Write */
-- ar5008_rf_bank_setup(ah->analogBank2Data, &ah->iniBank2, 1);
--
-- /* Setup Bank 6 Write */
-- ar5008_rf_bank_setup(ah->analogBank3Data, &ah->iniBank3,
-- modesIndex);
-- {
-- int i;
-- for (i = 0; i < ah->iniBank6TPC.ia_rows; i++) {
-- ah->analogBank6Data[i] =
-- INI_RA(&ah->iniBank6TPC, i, modesIndex);
-- }
-- }
-+ for (i = 0; i < ah->iniBank6.ia_rows; i++)
-+ ah->analogBank6Data[i] = INI_RA(&ah->iniBank6, i, modesIndex);
+ msp->is_ht = true;
+ memset(mi, 0, sizeof(*mi));
++
++ mi->sta = sta;
+ mi->stats_update = jiffies;
- /* Only the 5 or 2 GHz OB/DB need to be set for a mode */
- if (eepMinorRev >= 2) {
-@@ -568,22 +531,13 @@ static bool ar5008_hw_set_rf_regs(struct
- }
- }
+ ack_dur = ieee80211_frame_duration(sband->band, 10, 60, 1, 1);
+@@ -898,6 +919,9 @@ minstrel_ht_update_caps(void *priv, stru
+ if (!n_supported)
+ goto use_legacy;
-- /* Setup Bank 7 Setup */
-- ar5008_rf_bank_setup(ah->analogBank7Data, &ah->iniBank7, 1);
--
- /* Write Analog registers */
-- REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank6TPC, ah->analogBank6Data,
-- regWrites);
-- REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data,
-- regWrites);
-+ REG_WRITE_ARRAY(&bank0, 1, regWrites);
-+ REG_WRITE_ARRAY(&bank1, 1, regWrites);
-+ REG_WRITE_ARRAY(&bank2, 1, regWrites);
-+ REG_WRITE_ARRAY(&bank3, modesIndex, regWrites);
-+ ar5008_write_bank6(ah, ®Writes);
-+ REG_WRITE_ARRAY(&bank7, 1, regWrites);
++ minstrel_ht_update_stats(mp, mi);
++ minstrel_ht_update_rates(mp, mi);
++
+ return;
- return true;
- }
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -23,13 +23,13 @@
+ use_legacy:
+--- a/net/mac80211/rc80211_minstrel_ht.h
++++ b/net/mac80211/rc80211_minstrel_ht.h
+@@ -65,6 +65,8 @@ struct minstrel_mcs_group_data {
+ };
- /* General hardware code for the A5008/AR9001/AR9002 hadware families */
+ struct minstrel_ht_sta {
++ struct ieee80211_sta *sta;
++
+ /* ampdu length (average, per sampling interval) */
+ unsigned int ampdu_len;
+ unsigned int ampdu_packets;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1372,6 +1372,7 @@ ieee80211_rx_h_sta_process(struct ieee80
+ struct sk_buff *skb = rx->skb;
+ struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
++ int i;
--static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
-+static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
- {
- if (AR_SREV_9271(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271);
- INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271);
- INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg);
-- return;
-+ return 0;
+ if (!sta)
+ return RX_CONTINUE;
+@@ -1422,6 +1423,19 @@ ieee80211_rx_h_sta_process(struct ieee80
+ ewma_add(&sta->avg_signal, -status->signal);
}
- if (ah->config.pcie_clock_req)
-@@ -67,12 +67,10 @@ static void ar9002_hw_init_mode_regs(str
- } else if (AR_SREV_9100_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100);
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100);
- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100);
- } else {
- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC);
- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac);
++ if (status->chains) {
++ sta->chains = status->chains;
++ for (i = 0; i < ARRAY_SIZE(status->chain_signal); i++) {
++ int signal = status->chain_signal[i];
++
++ if (!(status->chains & BIT(i)))
++ continue;
++
++ sta->chain_signal_last[i] = signal;
++ ewma_add(&sta->chain_signal_avg[i], -signal);
++ }
++ }
++
+ /*
+ * Change STA power saving mode only at the end of a frame
+ * exchange sequence.
+@@ -2085,6 +2099,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
}
-@@ -80,20 +78,11 @@ static void ar9002_hw_init_mode_regs(str
- /* Common for AR5416, AR913x, AR9160 */
- INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain);
-
-- INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0);
-- INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1);
-- INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2);
-- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3);
-- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7);
--
-- /* Common for AR5416, AR9160 */
-- if (!AR_SREV_9100(ah))
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
--
- /* Common for AR913x, AR9160 */
- if (!AR_SREV_5416(ah))
-- INIT_INI_ARRAY(&ah->iniBank6TPC,
-- ar5416Bank6TPC_9100);
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC_9100);
-+ else
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC);
- }
+ fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data;
++ fwd_hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_RETRY);
+ info = IEEE80211_SKB_CB(fwd_skb);
+ memset(info, 0, sizeof(*info));
+ info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
+@@ -2356,6 +2371,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 &&
++ sdata->vif.type != NL80211_IFTYPE_WDS &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC)
+ break;
- /* iniAddac needs to be modified for these chips */
-@@ -104,7 +93,7 @@ static void ar9002_hw_init_mode_regs(str
+@@ -2423,6 +2439,22 @@ ieee80211_rx_h_action(struct ieee80211_r
+ }
- data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
- if (!data)
-- return;
-+ return -ENOMEM;
+ break;
++ case WLAN_CATEGORY_PUBLIC:
++ if (len < IEEE80211_MIN_ACTION_SIZE + 1)
++ goto invalid;
++ if (sdata->vif.type != NL80211_IFTYPE_STATION)
++ break;
++ if (!rx->sta)
++ break;
++ if (!ether_addr_equal(mgmt->bssid, sdata->u.mgd.bssid))
++ break;
++ if (mgmt->u.action.u.ext_chan_switch.action_code !=
++ WLAN_PUB_ACTION_EXT_CHANSW_ANN)
++ break;
++ if (len < offsetof(struct ieee80211_mgmt,
++ u.action.u.ext_chan_switch.variable))
++ goto invalid;
++ goto queue;
+ case WLAN_CATEGORY_VHT:
+ if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+ sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
+@@ -2506,10 +2538,6 @@ ieee80211_rx_h_action(struct ieee80211_r
+ ieee80211_process_measurement_req(sdata, mgmt, len);
+ goto handled;
+ case WLAN_ACTION_SPCT_CHL_SWITCH:
+- if (len < (IEEE80211_MIN_ACTION_SIZE +
+- sizeof(mgmt->u.action.u.chan_switch)))
+- break;
+-
+ if (sdata->vif.type != NL80211_IFTYPE_STATION)
+ break;
- memcpy(data, addac->ia_array, size);
- addac->ia_array = data;
-@@ -120,6 +109,7 @@ static void ar9002_hw_init_mode_regs(str
- INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
- ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
- }
-+ return 0;
- }
+@@ -2695,14 +2723,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
- static void ar9280_20_hw_init_rxgain_ini(struct ath_hw *ah)
-@@ -415,7 +405,10 @@ int ar9002_hw_attach_ops(struct ath_hw *
- struct ath_hw_ops *ops = ath9k_hw_ops(ah);
- int ret;
+ if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+- sdata->vif.type != NL80211_IFTYPE_STATION)
++ sdata->vif.type != NL80211_IFTYPE_STATION &&
++ sdata->vif.type != NL80211_IFTYPE_WDS)
+ return RX_DROP_MONITOR;
-- priv_ops->init_mode_regs = ar9002_hw_init_mode_regs;
-+ ret = ar9002_hw_init_mode_regs(ah);
-+ if (ret)
-+ return ret;
+ 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_ASSOC_RESP):
+ case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+@@ -3023,6 +3052,9 @@ static int prepare_for_handlers(struct i
+ * and location updates. Note that mac80211
+ * itself never looks at these frames.
+ */
++ if (!multicast &&
++ !ether_addr_equal(sdata->vif.addr, hdr->addr1))
++ return 0;
+ if (ieee80211_is_public_action(hdr, skb->len))
+ return 1;
+ if (!ieee80211_is_beacon(hdr->frame_control))
+@@ -3031,10 +3063,16 @@ static int prepare_for_handlers(struct i
+ }
+ break;
+ case NL80211_IFTYPE_WDS:
+- if (bssid || !ieee80211_is_data(hdr->frame_control))
+- return 0;
+ if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
+ return 0;
+
- priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;
-
- ops->config_pci_powersave = ar9002_hw_configpcipowersave;
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -54,11 +54,6 @@ static void ath9k_hw_init_cal_settings(s
- ath9k_hw_private_ops(ah)->init_cal_settings(ah);
- }
++ if (ieee80211_is_data(hdr->frame_control) ||
++ ieee80211_is_action(hdr->frame_control)) {
++ if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
++ return 0;
++ } else if (!ieee80211_is_beacon(hdr->frame_control))
++ return 0;
++
+ break;
+ case NL80211_IFTYPE_P2P_DEVICE:
+ if (!ieee80211_is_public_action(hdr, skb->len) &&
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -181,7 +181,7 @@ void ieee80211_scan_rx(struct ieee80211_
+ if (baselen > skb->len)
+ return;
--static void ath9k_hw_init_mode_regs(struct ath_hw *ah)
--{
-- ath9k_hw_private_ops(ah)->init_mode_regs(ah);
--}
--
- static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
- struct ath9k_channel *chan)
- {
-@@ -208,7 +203,7 @@ void ath9k_hw_synth_delay(struct ath_hw
- udelay(hw_delay + BASE_ACTIVATE_DELAY);
- }
+- ieee802_11_parse_elems(elements, skb->len - baselen, &elems);
++ ieee802_11_parse_elems(elements, skb->len - baselen, false, &elems);
--void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
-+void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
- int column, unsigned int *writecnt)
- {
- int r;
-@@ -554,10 +549,8 @@ static int ath9k_hw_post_init(struct ath
- ah->eep_ops->get_eeprom_ver(ah),
- ah->eep_ops->get_eeprom_rev(ah));
-
-- if (ah->config.enable_ani) {
-- ath9k_hw_ani_setup(ah);
-+ if (ah->config.enable_ani)
- ath9k_hw_ani_init(ah);
-- }
+ channel = ieee80211_get_channel(local->hw.wiphy, rx_status->freq);
- return 0;
- }
-@@ -670,8 +663,6 @@ static int __ath9k_hw_init(struct ath_hw
- if (!AR_SREV_9300_20_OR_LATER(ah))
- ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -32,7 +32,6 @@
+ * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
+ * frames.
+ * @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.
+@@ -66,7 +65,6 @@ enum ieee80211_sta_info_flags {
+ WLAN_STA_AUTHORIZED,
+ WLAN_STA_SHORT_PREAMBLE,
+ WLAN_STA_WME,
+- WLAN_STA_WDS,
+ WLAN_STA_CLEAR_PS_FILT,
+ WLAN_STA_MFP,
+ WLAN_STA_BLOCK_BA,
+@@ -344,6 +342,11 @@ struct sta_info {
+ int last_signal;
+ struct ewma avg_signal;
+ int last_ack_signal;
++
++ u8 chains;
++ s8 chain_signal_last[IEEE80211_MAX_CHAINS];
++ struct ewma chain_signal_avg[IEEE80211_MAX_CHAINS];
++
+ /* Plus 1 for non-QoS frames */
+ __le16 last_seq_ctrl[IEEE80211_NUM_TIDS + 1];
+
+--- a/net/mac80211/trace.h
++++ b/net/mac80211/trace.h
+@@ -990,23 +990,23 @@ TRACE_EVENT(drv_channel_switch,
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
++ CHANDEF_ENTRY
+ __field(u64, timestamp)
+ __field(bool, block_tx)
+- __field(u16, freq)
+ __field(u8, count)
+ ),
+
+ TP_fast_assign(
+ LOCAL_ASSIGN;
++ CHANDEF_ASSIGN(&ch_switch->chandef)
+ __entry->timestamp = ch_switch->timestamp;
+ __entry->block_tx = ch_switch->block_tx;
+- __entry->freq = ch_switch->channel->center_freq;
+ __entry->count = ch_switch->count;
+ ),
+
+ TP_printk(
+- LOCAL_PR_FMT " new freq:%u count:%d",
+- LOCAL_PR_ARG, __entry->freq, __entry->count
++ LOCAL_PR_FMT " new " CHANDEF_PR_FMT " count:%d",
++ LOCAL_PR_ARG, CHANDEF_PR_ARG, __entry->count
+ )
+ );
-- ath9k_hw_init_mode_regs(ah);
--
- if (!ah->is_pciexpress)
- ath9k_hw_disablepcie(ah);
-
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -599,7 +599,6 @@ struct ath_hw_radar_conf {
- * @init_cal_settings: setup types of calibrations supported
- * @init_cal: starts actual calibration
- *
-- * @init_mode_regs: Initializes mode registers
- * @init_mode_gain_regs: Initialize TX/RX gain registers
- *
- * @rf_set_freq: change frequency
-@@ -618,7 +617,6 @@ struct ath_hw_private_ops {
- void (*init_cal_settings)(struct ath_hw *ah);
- bool (*init_cal)(struct ath_hw *ah, struct ath9k_channel *chan);
-
-- void (*init_mode_regs)(struct ath_hw *ah);
- void (*init_mode_gain_regs)(struct ath_hw *ah);
- void (*setup_calibration)(struct ath_hw *ah,
- struct ath9k_cal_list *currCal);
-@@ -810,14 +808,7 @@ struct ath_hw {
- struct ath_hw_ops ops;
-
- /* Used to program the radio on non single-chip devices */
-- u32 *analogBank0Data;
-- u32 *analogBank1Data;
-- u32 *analogBank2Data;
-- u32 *analogBank3Data;
- u32 *analogBank6Data;
-- u32 *analogBank6TPCData;
-- u32 *analogBank7Data;
-- u32 *bank6Temp;
-
- int coverage_class;
- u32 slottime;
-@@ -826,10 +817,6 @@ struct ath_hw {
- /* ANI */
- u32 proc_phyerr;
- u32 aniperiod;
-- int totalSizeDesired[5];
-- int coarse_high[5];
-- int coarse_low[5];
-- int firpwr[5];
- enum ath9k_ani_cmd ani_function;
- u32 ani_skip_count;
-
-@@ -852,14 +839,8 @@ struct ath_hw {
-
- struct ar5416IniArray iniModes;
- struct ar5416IniArray iniCommon;
-- struct ar5416IniArray iniBank0;
- struct ar5416IniArray iniBB_RfGain;
-- struct ar5416IniArray iniBank1;
-- struct ar5416IniArray iniBank2;
-- struct ar5416IniArray iniBank3;
- struct ar5416IniArray iniBank6;
-- struct ar5416IniArray iniBank6TPC;
-- struct ar5416IniArray iniBank7;
- struct ar5416IniArray iniAddac;
- struct ar5416IniArray iniPcieSerdes;
- #ifdef CONFIG_PM_SLEEP
-@@ -975,7 +956,7 @@ void ath9k_hw_setantenna(struct ath_hw *
- void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
- int hw_delay);
- bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
--void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
-+void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
- int column, unsigned int *writecnt);
- u32 ath9k_hw_reverse_bits(u32 val, u32 n);
- u16 ath9k_hw_computetxtime(struct ath_hw *ah,
-@@ -1062,6 +1043,7 @@ void ar9003_paprd_setup_gain_table(struc
- int ar9003_paprd_init_table(struct ath_hw *ah);
- bool ar9003_paprd_is_done(struct ath_hw *ah);
- bool ar9003_is_paprd_enabled(struct ath_hw *ah);
-+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
-
- /* Hardware family op attach helpers */
- int ar5008_hw_attach_phy_ops(struct ath_hw *ah);
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -1677,10 +1677,10 @@ netdev_tx_t ieee80211_monitor_start_xmit
- chanctx_conf =
- rcu_dereference(tmp_sdata->vif.chanctx_conf);
- }
-- if (!chanctx_conf)
-- goto fail_rcu;
--
-- chan = chanctx_conf->def.chan;
-+ if (chanctx_conf)
-+ chan = chanctx_conf->def.chan;
-+ else
-+ chan = local->_oper_channel;
+@@ -48,15 +48,15 @@ static __le16 ieee80211_duration(struct
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- /*
- * Frame injection is not allowed if beaconing is not allowed
---- a/drivers/net/wireless/ath/ath9k/ani.c
-+++ b/drivers/net/wireless/ath/ath9k/ani.c
-@@ -152,7 +152,8 @@ static void ath9k_hw_set_ofdm_nil(struct
- ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
- aniState->ofdmNoiseImmunityLevel,
- immunityLevel, BEACON_RSSI(ah),
-- aniState->rssiThrLow, aniState->rssiThrHigh);
-+ ATH9K_ANI_RSSI_THR_LOW,
-+ ATH9K_ANI_RSSI_THR_HIGH);
-
- if (!scan)
- aniState->ofdmNoiseImmunityLevel = immunityLevel;
-@@ -173,7 +174,7 @@ static void ath9k_hw_set_ofdm_nil(struct
-
- weak_sig = entry_ofdm->ofdm_weak_signal_on;
- if (ah->opmode == NL80211_IFTYPE_STATION &&
-- BEACON_RSSI(ah) <= aniState->rssiThrHigh)
-+ BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_HIGH)
- weak_sig = true;
-
- if (aniState->ofdmWeakSigDetect != weak_sig)
-@@ -216,11 +217,11 @@ static void ath9k_hw_set_cck_nil(struct
-
- ath_dbg(common, ANI, "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
- aniState->cckNoiseImmunityLevel, immunityLevel,
-- BEACON_RSSI(ah), aniState->rssiThrLow,
-- aniState->rssiThrHigh);
-+ BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
-+ ATH9K_ANI_RSSI_THR_HIGH);
-
- if (ah->opmode == NL80211_IFTYPE_STATION &&
-- BEACON_RSSI(ah) <= aniState->rssiThrLow &&
-+ BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
- immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
- immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
-
-@@ -418,9 +419,6 @@ void ath9k_hw_ani_monitor(struct ath_hw
- return;
-
- aniState = &ah->curchan->ani;
-- if (WARN_ON(!aniState))
-- return;
--
- if (!ath9k_hw_ani_read_counters(ah))
- return;
-
-@@ -489,23 +487,6 @@ void ath9k_hw_disable_mib_counters(struc
- }
- EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
-
--void ath9k_hw_ani_setup(struct ath_hw *ah)
--{
-- int i;
--
-- static const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
-- static const int coarseHigh[] = { -14, -14, -14, -14, -12 };
-- static const int coarseLow[] = { -64, -64, -64, -64, -70 };
-- static const int firpwr[] = { -78, -78, -78, -78, -80 };
--
-- for (i = 0; i < 5; i++) {
-- ah->totalSizeDesired[i] = totalSizeDesired[i];
-- ah->coarse_high[i] = coarseHigh[i];
-- ah->coarse_low[i] = coarseLow[i];
-- ah->firpwr[i] = firpwr[i];
-- }
--}
--
- void ath9k_hw_ani_init(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -531,8 +512,6 @@ void ath9k_hw_ani_init(struct ath_hw *ah
-
- ani->ofdmsTurn = true;
-
-- ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
-- ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
- ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
- ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
- ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
---- a/drivers/net/wireless/ath/ath9k/ani.h
-+++ b/drivers/net/wireless/ath/ath9k/ani.h
-@@ -104,7 +104,6 @@ struct ath9k_ani_default {
- };
-
- struct ar5416AniState {
-- struct ath9k_channel *c;
- u8 noiseImmunityLevel;
- u8 ofdmNoiseImmunityLevel;
- u8 cckNoiseImmunityLevel;
-@@ -113,15 +112,9 @@ struct ar5416AniState {
- u8 spurImmunityLevel;
- u8 firstepLevel;
- u8 ofdmWeakSigDetect;
-- u8 cckWeakSigThreshold;
- u32 listenTime;
-- int32_t rssiThrLow;
-- int32_t rssiThrHigh;
- u32 ofdmPhyErrCount;
- u32 cckPhyErrCount;
-- int16_t pktRssi[2];
-- int16_t ofdmErrRssi[2];
-- int16_t cckErrRssi[2];
- struct ath9k_ani_default iniDef;
- };
+ /* assume HW handles this */
+- if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)
++ if (tx->rate.flags & IEEE80211_TX_RC_MCS)
+ return 0;
-@@ -147,7 +140,6 @@ struct ar5416Stats {
+ /* uh huh? */
+- if (WARN_ON_ONCE(info->control.rates[0].idx < 0))
++ if (WARN_ON_ONCE(tx->rate.idx < 0))
+ return 0;
- void ath9k_enable_mib_counters(struct ath_hw *ah);
- void ath9k_hw_disable_mib_counters(struct ath_hw *ah);
--void ath9k_hw_ani_setup(struct ath_hw *ah);
- void ath9k_hw_ani_init(struct ath_hw *ah);
+ sband = local->hw.wiphy->bands[info->band];
+- txrate = &sband->bitrates[info->control.rates[0].idx];
++ txrate = &sband->bitrates[tx->rate.idx];
- #endif /* ANI_H */
---- a/drivers/net/wireless/ath/ath9k/calib.h
-+++ b/drivers/net/wireless/ath/ath9k/calib.h
-@@ -33,6 +33,12 @@ struct ar5416IniArray {
- u32 ia_columns;
- };
+ erp = txrate->flags & IEEE80211_RATE_ERP_G;
-+#define STATIC_INI_ARRAY(array) { \
-+ .ia_array = (u32 *)(array), \
-+ .ia_rows = ARRAY_SIZE(array), \
-+ .ia_columns = ARRAY_SIZE(array[0]), \
-+ }
+@@ -617,11 +617,9 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
+ struct ieee80211_hdr *hdr = (void *)tx->skb->data;
+ struct ieee80211_supported_band *sband;
+- struct ieee80211_rate *rate;
+- int i;
+ u32 len;
+- bool inval = false, rts = false, short_preamble = false;
+ struct ieee80211_tx_rate_control txrc;
++ struct ieee80211_sta_rates *ratetbl = NULL;
+ bool assoc = false;
+
+ memset(&txrc, 0, sizeof(txrc));
+@@ -642,18 +640,23 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+ txrc.max_rate_idx = -1;
+ else
+ txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+- memcpy(txrc.rate_idx_mcs_mask,
+- tx->sdata->rc_rateidx_mcs_mask[info->band],
+- sizeof(txrc.rate_idx_mcs_mask));
+
- #define INIT_INI_ARRAY(iniarray, array) do { \
- (iniarray)->ia_array = (u32 *)(array); \
- (iniarray)->ia_rows = ARRAY_SIZE(array); \
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -378,7 +378,7 @@ static void ath_tx_count_frames(struct a
-
- static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
- struct ath_buf *bf, struct list_head *bf_q,
-- struct ath_tx_status *ts, int txok, bool retry)
-+ struct ath_tx_status *ts, int txok)
- {
- struct ath_node *an = NULL;
- struct sk_buff *skb;
-@@ -490,7 +490,7 @@ static void ath_tx_complete_aggr(struct
- } else if (!isaggr && txok) {
- /* transmit completion */
- acked_cnt++;
-- } else if ((tid->state & AGGR_CLEANUP) || !retry) {
-+ } else if (tid->state & AGGR_CLEANUP) {
- /*
- * cleanup in progress, just fail
- * the un-acked sub-frames
-@@ -604,6 +604,37 @@ static void ath_tx_complete_aggr(struct
- ath9k_queue_reset(sc, RESET_TYPE_TX_ERROR);
- }
++ if (tx->sdata->rc_has_mcs_mask[info->band])
++ txrc.rate_idx_mcs_mask =
++ tx->sdata->rc_rateidx_mcs_mask[info->band];
++
+ txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
+ tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
+ tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
+
+ /* set up RTS protection if desired */
+ if (len > tx->local->hw.wiphy->rts_threshold) {
+- txrc.rts = rts = true;
++ txrc.rts = true;
+ }
-+static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
-+{
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
-+}
++ info->control.use_rts = txrc.rts;
++ info->control.use_cts_prot = tx->sdata->vif.bss_conf.use_cts_prot;
+
-+static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_tx_status *ts, struct ath_buf *bf,
-+ struct list_head *bf_head)
-+{
-+ bool txok, flush;
+ /*
+ * Use short preamble if the BSS can handle it, but not for
+ * management frames unless we know the receiver can handle
+@@ -663,7 +666,9 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+ if (tx->sdata->vif.bss_conf.use_short_preamble &&
+ (ieee80211_is_data(hdr->frame_control) ||
+ (tx->sta && test_sta_flag(tx->sta, WLAN_STA_SHORT_PREAMBLE))))
+- txrc.short_preamble = short_preamble = true;
++ txrc.short_preamble = true;
+
-+ txok = !(ts->ts_status & ATH9K_TXERR_MASK);
-+ flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
-+ txq->axq_tx_inprogress = false;
++ info->control.short_preamble = txrc.short_preamble;
+
+ if (tx->sta)
+ assoc = test_sta_flag(tx->sta, WLAN_STA_ASSOC);
+@@ -687,16 +692,38 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+ */
+ rate_control_get_rate(tx->sdata, tx->sta, &txrc);
+
+- if (unlikely(info->control.rates[0].idx < 0))
+- return TX_DROP;
++ if (tx->sta && !info->control.skip_table)
++ ratetbl = rcu_dereference(tx->sta->sta.rates);
+
-+ txq->axq_depth--;
-+ if (bf_is_ampdu_not_probing(bf))
-+ txq->axq_ampdu_depth--;
++ if (unlikely(info->control.rates[0].idx < 0)) {
++ if (ratetbl) {
++ struct ieee80211_tx_rate rate = {
++ .idx = ratetbl->rate[0].idx,
++ .flags = ratetbl->rate[0].flags,
++ .count = ratetbl->rate[0].count
++ };
+
-+ if (!bf_isampdu(bf)) {
-+ if (!flush)
-+ ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
-+ ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
-+ } else
-+ ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
++ if (ratetbl->rate[0].idx < 0)
++ return TX_DROP;
+
-+ if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !flush)
-+ ath_txq_schedule(sc, txq);
-+}
++ tx->rate = rate;
++ } else {
++ return TX_DROP;
++ }
++ } else {
++ tx->rate = info->control.rates[0];
++ }
+
+ if (txrc.reported_rate.idx < 0) {
+- txrc.reported_rate = info->control.rates[0];
++ txrc.reported_rate = tx->rate;
+ if (tx->sta && ieee80211_is_data(hdr->frame_control))
+ tx->sta->last_tx_rate = txrc.reported_rate;
+ } else if (tx->sta)
+ tx->sta->last_tx_rate = txrc.reported_rate;
+
++ if (ratetbl)
++ return TX_CONTINUE;
+
- static bool ath_lookup_legacy(struct ath_buf *bf)
- {
- struct sk_buff *skb;
-@@ -1331,23 +1362,6 @@ void ath_tx_aggr_resume(struct ath_softc
- /* Queue Management */
- /********************/
+ if (unlikely(!info->control.rates[0].count))
+ info->control.rates[0].count = 1;
--static void ath_txq_drain_pending_buffers(struct ath_softc *sc,
-- struct ath_txq *txq)
--{
-- struct ath_atx_ac *ac, *ac_tmp;
-- struct ath_atx_tid *tid, *tid_tmp;
+@@ -704,91 +731,6 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+ (info->flags & IEEE80211_TX_CTL_NO_ACK)))
+ info->control.rates[0].count = 1;
+
+- if (is_multicast_ether_addr(hdr->addr1)) {
+- /*
+- * XXX: verify the rate is in the basic rateset
+- */
+- return TX_CONTINUE;
+- }
+-
+- /*
+- * set up the RTS/CTS rate as the fastest basic rate
+- * that is not faster than the data rate
+- *
+- * XXX: Should this check all retry rates?
+- */
+- if (!(info->control.rates[0].flags & IEEE80211_TX_RC_MCS)) {
+- s8 baserate = 0;
-
-- list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) {
-- list_del(&ac->list);
-- ac->sched = false;
-- list_for_each_entry_safe(tid, tid_tmp, &ac->tid_q, list) {
-- list_del(&tid->list);
-- tid->sched = false;
-- ath_tid_drain(sc, txq, tid);
+- rate = &sband->bitrates[info->control.rates[0].idx];
+-
+- for (i = 0; i < sband->n_bitrates; i++) {
+- /* must be a basic rate */
+- if (!(tx->sdata->vif.bss_conf.basic_rates & BIT(i)))
+- continue;
+- /* must not be faster than the data rate */
+- if (sband->bitrates[i].bitrate > rate->bitrate)
+- continue;
+- /* maximum */
+- if (sband->bitrates[baserate].bitrate <
+- sband->bitrates[i].bitrate)
+- baserate = i;
- }
+-
+- info->control.rts_cts_rate_idx = baserate;
- }
--}
-
- struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
- {
- struct ath_hw *ah = sc->sc_ah;
-@@ -1470,14 +1484,8 @@ int ath_cabq_update(struct ath_softc *sc
- return 0;
- }
-
--static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
--{
-- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(bf->bf_mpdu);
-- return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
--}
+- for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+- /*
+- * make sure there's no valid rate following
+- * an invalid one, just in case drivers don't
+- * take the API seriously to stop at -1.
+- */
+- if (inval) {
+- info->control.rates[i].idx = -1;
+- continue;
+- }
+- if (info->control.rates[i].idx < 0) {
+- inval = true;
+- continue;
+- }
-
- static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
-- struct list_head *list, bool retry_tx)
-+ struct list_head *list)
- {
- struct ath_buf *bf, *lastbf;
- struct list_head bf_head;
-@@ -1499,16 +1507,7 @@ static void ath_drain_txq_list(struct at
-
- lastbf = bf->bf_lastbf;
- list_cut_position(&bf_head, list, &lastbf->list);
+- /*
+- * For now assume MCS is already set up correctly, this
+- * needs to be fixed.
+- */
+- if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS) {
+- WARN_ON(info->control.rates[i].idx > 76);
+- continue;
+- }
-
-- txq->axq_depth--;
-- if (bf_is_ampdu_not_probing(bf))
-- txq->axq_ampdu_depth--;
+- /* set up RTS protection if desired */
+- if (rts)
+- info->control.rates[i].flags |=
+- IEEE80211_TX_RC_USE_RTS_CTS;
-
-- if (bf_isampdu(bf))
-- ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0,
-- retry_tx);
-- else
-- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
-+ ath_tx_process_buffer(sc, txq, &ts, bf, &bf_head);
- }
- }
-
-@@ -1518,7 +1517,7 @@ static void ath_drain_txq_list(struct at
- * This assumes output has been stopped and
- * we do not need to block ath_tx_tasklet.
- */
--void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
-+void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq)
- {
- ath_txq_lock(sc, txq);
-
-@@ -1526,8 +1525,7 @@ void ath_draintxq(struct ath_softc *sc,
- int idx = txq->txq_tailidx;
-
- while (!list_empty(&txq->txq_fifo[idx])) {
-- ath_drain_txq_list(sc, txq, &txq->txq_fifo[idx],
-- retry_tx);
-+ ath_drain_txq_list(sc, txq, &txq->txq_fifo[idx]);
-
- INCR(idx, ATH_TXFIFO_DEPTH);
- }
-@@ -1536,16 +1534,12 @@ void ath_draintxq(struct ath_softc *sc,
-
- txq->axq_link = NULL;
- txq->axq_tx_inprogress = false;
-- ath_drain_txq_list(sc, txq, &txq->axq_q, retry_tx);
+- /* RC is busted */
+- if (WARN_ON_ONCE(info->control.rates[i].idx >=
+- sband->n_bitrates)) {
+- info->control.rates[i].idx = -1;
+- continue;
+- }
+-
+- rate = &sband->bitrates[info->control.rates[i].idx];
+-
+- /* set up short preamble */
+- if (short_preamble &&
+- rate->flags & IEEE80211_RATE_SHORT_PREAMBLE)
+- info->control.rates[i].flags |=
+- IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
+-
+- /* set up G protection */
+- if (!rts && tx->sdata->vif.bss_conf.use_cts_prot &&
+- rate->flags & IEEE80211_RATE_ERP_G)
+- info->control.rates[i].flags |=
+- IEEE80211_TX_RC_USE_CTS_PROTECT;
+- }
-
-- /* flush any pending frames if aggregation is enabled */
-- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !retry_tx)
-- ath_txq_drain_pending_buffers(sc, txq);
-+ ath_drain_txq_list(sc, txq, &txq->axq_q);
+ return TX_CONTINUE;
+ }
- ath_txq_unlock_complete(sc, txq);
+@@ -2508,8 +2450,6 @@ struct sk_buff *ieee80211_beacon_get_tim
+ txrc.max_rate_idx = -1;
+ else
+ txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+- memcpy(txrc.rate_idx_mcs_mask, sdata->rc_rateidx_mcs_mask[band],
+- sizeof(txrc.rate_idx_mcs_mask));
+ txrc.bss = true;
+ rate_control_get_rate(sdata, NULL, &txrc);
+
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -485,7 +485,8 @@ int ieee80211_queue_stopped(struct ieee8
+ return true;
+
+ spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+- ret = !!local->queue_stop_reasons[queue];
++ ret = test_bit(IEEE80211_QUEUE_STOP_REASON_DRIVER,
++ &local->queue_stop_reasons[queue]);
+ spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+ return ret;
}
+@@ -559,6 +560,9 @@ void ieee80211_iterate_active_interfaces
+ list_for_each_entry(sdata, &local->interfaces, list) {
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_MONITOR:
++ if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
++ continue;
++ break;
+ case NL80211_IFTYPE_AP_VLAN:
+ continue;
+ default:
+@@ -597,6 +601,9 @@ void ieee80211_iterate_active_interfaces
+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_MONITOR:
++ if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
++ continue;
++ break;
+ case NL80211_IFTYPE_AP_VLAN:
+ continue;
+ default:
+@@ -660,7 +667,7 @@ void ieee80211_queue_delayed_work(struct
+ }
+ EXPORT_SYMBOL(ieee80211_queue_delayed_work);
--bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
-+bool ath_drain_all_txq(struct ath_softc *sc)
+-u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
++u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, bool action,
+ struct ieee802_11_elems *elems,
+ u64 filter, u32 crc)
{
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-@@ -1581,7 +1575,7 @@ bool ath_drain_all_txq(struct ath_softc
- */
- txq = &sc->tx.txq[i];
- txq->stopped = false;
-- ath_draintxq(sc, txq, retry_tx);
-+ ath_draintxq(sc, txq);
- }
+@@ -668,6 +675,7 @@ u32 ieee802_11_parse_elems_crc(u8 *start
+ u8 *pos = start;
+ bool calc_crc = filter != 0;
+ DECLARE_BITMAP(seen_elems, 256);
++ const u8 *ie;
+
+ bitmap_zero(seen_elems, 256);
+ memset(elems, 0, sizeof(*elems));
+@@ -715,6 +723,12 @@ u32 ieee802_11_parse_elems_crc(u8 *start
+ case WLAN_EID_COUNTRY:
+ case WLAN_EID_PWR_CONSTRAINT:
+ case WLAN_EID_TIMEOUT_INTERVAL:
++ case WLAN_EID_SECONDARY_CHANNEL_OFFSET:
++ case WLAN_EID_WIDE_BW_CHANNEL_SWITCH:
++ /*
++ * not listing WLAN_EID_CHANNEL_SWITCH_WRAPPER -- it seems possible
++ * that if the content gets bigger it might be needed more than once
++ */
+ if (test_bit(id, seen_elems)) {
+ elems->parse_error = true;
+ left -= elen;
+@@ -862,6 +876,48 @@ u32 ieee802_11_parse_elems_crc(u8 *start
+ }
+ elems->ch_switch_ie = (void *)pos;
+ break;
++ case WLAN_EID_EXT_CHANSWITCH_ANN:
++ if (elen != sizeof(struct ieee80211_ext_chansw_ie)) {
++ elem_parse_failed = true;
++ break;
++ }
++ elems->ext_chansw_ie = (void *)pos;
++ break;
++ case WLAN_EID_SECONDARY_CHANNEL_OFFSET:
++ if (elen != sizeof(struct ieee80211_sec_chan_offs_ie)) {
++ elem_parse_failed = true;
++ break;
++ }
++ elems->sec_chan_offs = (void *)pos;
++ break;
++ case WLAN_EID_WIDE_BW_CHANNEL_SWITCH:
++ if (!action ||
++ elen != sizeof(*elems->wide_bw_chansw_ie)) {
++ elem_parse_failed = true;
++ break;
++ }
++ elems->wide_bw_chansw_ie = (void *)pos;
++ break;
++ case WLAN_EID_CHANNEL_SWITCH_WRAPPER:
++ if (action) {
++ elem_parse_failed = true;
++ break;
++ }
++ /*
++ * This is a bit tricky, but as we only care about
++ * the wide bandwidth channel switch element, so
++ * just parse it out manually.
++ */
++ ie = cfg80211_find_ie(WLAN_EID_WIDE_BW_CHANNEL_SWITCH,
++ pos, elen);
++ if (ie) {
++ if (ie[1] == sizeof(*elems->wide_bw_chansw_ie))
++ elems->wide_bw_chansw_ie =
++ (void *)(ie + 2);
++ else
++ elem_parse_failed = true;
++ }
++ break;
+ case WLAN_EID_COUNTRY:
+ elems->country_elem = pos;
+ elems->country_elem_len = elen;
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -857,7 +857,7 @@ static void handle_channel(struct wiphy
+ return;
- return !npend;
-@@ -2175,28 +2169,6 @@ static void ath_tx_rc_status(struct ath_
- tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1;
- }
+ REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq);
+- chan->flags = IEEE80211_CHAN_DISABLED;
++ chan->flags |= IEEE80211_CHAN_DISABLED;
+ return;
+ }
--static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_tx_status *ts, struct ath_buf *bf,
-- struct list_head *bf_head)
--{
-- int txok;
--
-- txq->axq_depth--;
-- txok = !(ts->ts_status & ATH9K_TXERR_MASK);
-- txq->axq_tx_inprogress = false;
-- if (bf_is_ampdu_not_probing(bf))
-- txq->axq_ampdu_depth--;
--
-- if (!bf_isampdu(bf)) {
-- ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
-- ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
-- } else
-- ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true);
--
-- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
-- ath_txq_schedule(sc, txq);
--}
--
- static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
- {
- struct ath_hw *ah = sc->sc_ah;
---- a/net/mac80211/rc80211_minstrel.c
-+++ b/net/mac80211/rc80211_minstrel.c
-@@ -494,6 +494,33 @@ minstrel_free_sta(void *priv, struct iee
- kfree(mi);
+--- a/net/wireless/util.c
++++ b/net/wireless/util.c
+@@ -1156,6 +1156,26 @@ int cfg80211_get_p2p_attr(const u8 *ies,
}
+ EXPORT_SYMBOL(cfg80211_get_p2p_attr);
-+static void
-+minstrel_init_cck_rates(struct minstrel_priv *mp)
++bool ieee80211_operating_class_to_band(u8 operating_class,
++ enum ieee80211_band *band)
+{
-+ static const int bitrates[4] = { 10, 20, 55, 110 };
-+ struct ieee80211_supported_band *sband;
-+ int i, j;
-+
-+ sband = mp->hw->wiphy->bands[IEEE80211_BAND_2GHZ];
-+ if (!sband)
-+ return;
-+
-+ for (i = 0, j = 0; i < sband->n_bitrates; i++) {
-+ struct ieee80211_rate *rate = &sband->bitrates[i];
-+
-+ if (rate->flags & IEEE80211_RATE_ERP_G)
-+ continue;
-+
-+ for (j = 0; j < ARRAY_SIZE(bitrates); j++) {
-+ if (rate->bitrate != bitrates[j])
-+ continue;
-+
-+ mp->cck_rates[j] = i;
-+ break;
-+ }
++ switch (operating_class) {
++ case 112:
++ case 115 ... 127:
++ *band = IEEE80211_BAND_5GHZ;
++ return true;
++ case 81:
++ case 82:
++ case 83:
++ case 84:
++ *band = IEEE80211_BAND_2GHZ;
++ return true;
+ }
++
++ return false;
+}
++EXPORT_SYMBOL(ieee80211_operating_class_to_band);
+
- static void *
- minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
+ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
+ u32 beacon_int)
{
-@@ -539,6 +566,8 @@ minstrel_alloc(struct ieee80211_hw *hw,
- S_IRUGO | S_IWUGO, debugfsdir, &mp->fixed_rate_idx);
- #endif
-
-+ minstrel_init_cck_rates(mp);
-+
- return mp;
- }
+--- a/include/uapi/linux/nl80211.h
++++ b/include/uapi/linux/nl80211.h
+@@ -1973,6 +1973,10 @@ enum nl80211_sta_bss_param {
+ * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
+ * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
+ * non-peer STA
++ * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
++ * Contains a nested array of signal strength attributes (u8, dBm)
++ * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
++ * Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
+ * @__NL80211_STA_INFO_AFTER_LAST: internal
+ * @NL80211_STA_INFO_MAX: highest possible station info attribute
+ */
+@@ -2002,6 +2006,8 @@ enum nl80211_sta_info {
+ NL80211_STA_INFO_NONPEER_PM,
+ NL80211_STA_INFO_RX_BYTES64,
+ NL80211_STA_INFO_TX_BYTES64,
++ NL80211_STA_INFO_CHAIN_SIGNAL,
++ NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
+
+ /* keep last */
+ __NL80211_STA_INFO_AFTER_LAST,
+@@ -2395,6 +2401,8 @@ enum nl80211_survey_info {
+ * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
+ * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
+ * overrides all other flags.
++ * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
++ * and ACK incoming unicast packets.
+ *
+ * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
+ * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
+@@ -2406,6 +2414,7 @@ enum nl80211_mntr_flags {
+ NL80211_MNTR_FLAG_CONTROL,
+ NL80211_MNTR_FLAG_OTHER_BSS,
+ NL80211_MNTR_FLAG_COOK_FRAMES,
++ NL80211_MNTR_FLAG_ACTIVE,
+
+ /* keep last */
+ __NL80211_MNTR_FLAG_AFTER_LAST,
+@@ -3557,6 +3566,7 @@ enum nl80211_feature_flags {
+ NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
+ NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
+ NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
++ NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
+ };
---- a/net/mac80211/rc80211_minstrel.h
-+++ b/net/mac80211/rc80211_minstrel.h
-@@ -79,6 +79,8 @@ struct minstrel_priv {
- unsigned int lookaround_rate;
- unsigned int lookaround_rate_mrr;
+ /**
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -358,6 +358,8 @@ struct sta_info *sta_info_alloc(struct i
+ do_posix_clock_monotonic_gettime(&uptime);
+ sta->last_connected = uptime.tv_sec;
+ ewma_init(&sta->avg_signal, 1024, 8);
++ for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
++ ewma_init(&sta->chain_signal_avg[i], 1024, 8);
+
+ if (sta_prepare_rate_control(local, sta, gfp)) {
+ kfree(sta);
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -2270,6 +2270,7 @@ static const struct nla_policy mntr_flag
+ [NL80211_MNTR_FLAG_CONTROL] = { .type = NLA_FLAG },
+ [NL80211_MNTR_FLAG_OTHER_BSS] = { .type = NLA_FLAG },
+ [NL80211_MNTR_FLAG_COOK_FRAMES] = { .type = NLA_FLAG },
++ [NL80211_MNTR_FLAG_ACTIVE] = { .type = NLA_FLAG },
+ };
-+ u8 cck_rates[4];
-+
- #ifdef CONFIG_MAC80211_DEBUGFS
- /*
- * enable fixed rate processing per RC
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
-@@ -63,6 +63,30 @@
- } \
- }
+ static int parse_monitor_flags(struct nlattr *nla, u32 *mntrflags)
+@@ -2381,6 +2382,10 @@ static int nl80211_set_interface(struct
+ change = true;
+ }
-+#define CCK_DURATION(_bitrate, _short, _len) \
-+ (10 /* SIFS */ + \
-+ (_short ? 72 + 24 : 144 + 48 ) + \
-+ (8 * (_len + 4) * 10) / (_bitrate))
-+
-+#define CCK_ACK_DURATION(_bitrate, _short) \
-+ (CCK_DURATION((_bitrate > 10 ? 20 : 10), false, 60) + \
-+ CCK_DURATION(_bitrate, _short, AVG_PKT_SIZE))
-+
-+#define CCK_DURATION_LIST(_short) \
-+ CCK_ACK_DURATION(10, _short), \
-+ CCK_ACK_DURATION(20, _short), \
-+ CCK_ACK_DURATION(55, _short), \
-+ CCK_ACK_DURATION(110, _short)
-+
-+#define CCK_GROUP \
-+ [MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS] = { \
-+ .streams = 0, \
-+ .duration = { \
-+ CCK_DURATION_LIST(false), \
-+ CCK_DURATION_LIST(true) \
-+ } \
-+ }
++ if ((*flags & NL80211_MNTR_FLAG_ACTIVE) &&
++ !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
++ return -EOPNOTSUPP;
+
- /*
- * To enable sufficiently targeted rate sampling, MCS rates are divided into
- * groups, based on the number of streams and flags (HT40, SGI) that they
-@@ -95,8 +119,13 @@ const struct mcs_group minstrel_mcs_grou
- #if MINSTREL_MAX_STREAMS >= 3
- MCS_GROUP(3, 1, 1),
- #endif
+ if (change)
+ err = cfg80211_change_iface(rdev, dev, ntype, flags, ¶ms);
+ else
+@@ -2438,6 +2443,11 @@ static int nl80211_new_interface(struct
+ err = parse_monitor_flags(type == NL80211_IFTYPE_MONITOR ?
+ info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL,
+ &flags);
+
-+ /* must be last */
-+ CCK_GROUP
- };
-
-+#define MINSTREL_CCK_GROUP (ARRAY_SIZE(minstrel_mcs_groups) - 1)
++ if (!err && (flags & NL80211_MNTR_FLAG_ACTIVE) &&
++ !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
++ return -EOPNOTSUPP;
+
- static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES];
-
- /*
-@@ -119,6 +148,29 @@ minstrel_ht_get_group_idx(struct ieee802
- !!(rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH));
+ wdev = rdev_add_virtual_intf(rdev,
+ nla_data(info->attrs[NL80211_ATTR_IFNAME]),
+ type, err ? NULL : &flags, ¶ms);
+@@ -3367,6 +3377,32 @@ static bool nl80211_put_sta_rate(struct
+ return true;
}
-+struct minstrel_rate_stats *
-+minstrel_ht_get_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+ struct ieee80211_tx_rate *rate)
++static bool nl80211_put_signal(struct sk_buff *msg, u8 mask, s8 *signal,
++ int id)
+{
-+ int group, idx;
++ void *attr;
++ int i = 0;
+
-+ if (rate->flags & IEEE80211_TX_RC_MCS) {
-+ group = minstrel_ht_get_group_idx(rate);
-+ idx = rate->idx % MCS_GROUP_RATES;
-+ } else {
-+ group = MINSTREL_CCK_GROUP;
++ if (!mask)
++ return true;
+
-+ for (idx = 0; idx < ARRAY_SIZE(mp->cck_rates); idx++)
-+ if (rate->idx == mp->cck_rates[idx])
-+ break;
++ attr = nla_nest_start(msg, id);
++ if (!attr)
++ return false;
++
++ for (i = 0; i < IEEE80211_MAX_CHAINS; i++) {
++ if (!(mask & BIT(i)))
++ continue;
+
-+ /* short preamble */
-+ if (!(mi->groups[group].supported & BIT(idx)))
-+ idx += 4;
++ if (nla_put_u8(msg, i, signal[i]))
++ return false;
+ }
-+ return &mi->groups[group].rates[idx];
++
++ nla_nest_end(msg, attr);
++
++ return true;
+}
+
- static inline struct minstrel_rate_stats *
- minstrel_get_ratestats(struct minstrel_ht_sta *mi, int index)
+ static int nl80211_send_station(struct sk_buff *msg, u32 portid, u32 seq,
+ int flags,
+ struct cfg80211_registered_device *rdev,
+@@ -3402,7 +3438,7 @@ static int nl80211_send_station(struct s
+ (u32)sinfo->rx_bytes))
+ goto nla_put_failure;
+ if ((sinfo->filled & (STATION_INFO_TX_BYTES |
+- NL80211_STA_INFO_TX_BYTES64)) &&
++ STATION_INFO_TX_BYTES64)) &&
+ nla_put_u32(msg, NL80211_STA_INFO_TX_BYTES,
+ (u32)sinfo->tx_bytes))
+ goto nla_put_failure;
+@@ -3438,6 +3474,18 @@ static int nl80211_send_station(struct s
+ default:
+ break;
+ }
++ if (sinfo->filled & STATION_INFO_CHAIN_SIGNAL) {
++ if (!nl80211_put_signal(msg, sinfo->chains,
++ sinfo->chain_signal,
++ NL80211_STA_INFO_CHAIN_SIGNAL))
++ goto nla_put_failure;
++ }
++ if (sinfo->filled & STATION_INFO_CHAIN_SIGNAL_AVG) {
++ if (!nl80211_put_signal(msg, sinfo->chains,
++ sinfo->chain_signal_avg,
++ NL80211_STA_INFO_CHAIN_SIGNAL_AVG))
++ goto nla_put_failure;
++ }
+ if (sinfo->filled & STATION_INFO_TX_BITRATE) {
+ if (!nl80211_put_sta_rate(msg, &sinfo->txrate,
+ NL80211_STA_INFO_TX_BITRATE))
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -768,7 +768,8 @@ void ath9k_set_hw_capab(struct ath_softc
+ IEEE80211_HW_SUPPORTS_PS |
+ IEEE80211_HW_PS_NULLFUNC_STACK |
+ IEEE80211_HW_SPECTRUM_MGMT |
+- IEEE80211_HW_REPORTS_TX_ACK_STATUS;
++ IEEE80211_HW_REPORTS_TX_ACK_STATUS |
++ IEEE80211_HW_SUPPORTS_RC_TABLE;
+
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
+ hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
+@@ -776,6 +777,8 @@ void ath9k_set_hw_capab(struct ath_softc
+ if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt)
+ hw->flags |= IEEE80211_HW_MFP_CAPABLE;
+
++ hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;
++
+ hw->wiphy->interface_modes =
+ BIT(NL80211_IFTYPE_P2P_GO) |
+ BIT(NL80211_IFTYPE_P2P_CLIENT) |
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -125,24 +125,6 @@ static void ath_tx_queue_tid(struct ath_
+ list_add_tail(&ac->list, &txq->axq_acq);
+ }
+
+-static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
+-{
+- struct ath_txq *txq = tid->ac->txq;
+-
+- WARN_ON(!tid->paused);
+-
+- ath_txq_lock(sc, txq);
+- tid->paused = false;
+-
+- if (skb_queue_empty(&tid->buf_q))
+- goto unlock;
+-
+- ath_tx_queue_tid(txq, tid);
+- ath_txq_schedule(sc, txq);
+-unlock:
+- ath_txq_unlock_complete(sc, txq);
+-}
+-
+ static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
{
-@@ -159,7 +211,7 @@ static void
- minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate)
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+@@ -157,6 +139,13 @@ static void ath_send_bar(struct ath_atx_
+ seqno << IEEE80211_SEQ_SEQ_SHIFT);
+ }
+
++static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,
++ struct ath_buf *bf)
++{
++ ieee80211_get_tx_rates(vif, sta, bf->bf_mpdu, bf->rates,
++ ARRAY_SIZE(bf->rates));
++}
++
+ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
{
- struct minstrel_rate_stats *mr;
-- unsigned int usecs;
-+ unsigned int usecs = 0;
+ struct ath_txq *txq = tid->ac->txq;
+@@ -189,15 +178,11 @@ static void ath_tx_flush_tid(struct ath_
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
+ sendbar = true;
+ } else {
++ ath_set_rates(tid->an->vif, tid->an->sta, bf);
+ ath_tx_send_normal(sc, txq, NULL, skb);
+ }
+ }
- mr = &mi->groups[group].rates[rate];
+- if (tid->baw_head == tid->baw_tail) {
+- tid->state &= ~AGGR_ADDBA_COMPLETE;
+- tid->state &= ~AGGR_CLEANUP;
+- }
+-
+ if (sendbar) {
+ ath_txq_unlock(sc, txq);
+ ath_send_bar(tid, tid->seq_start);
+@@ -269,9 +254,7 @@ static void ath_tid_drain(struct ath_sof
-@@ -168,7 +220,9 @@ minstrel_ht_calc_tp(struct minstrel_ht_s
- return;
+ list_add_tail(&bf->list, &bf_head);
+
+- if (fi->retries)
+- ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
+-
++ ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
}
-- usecs = mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
-+ if (group != MINSTREL_CCK_GROUP)
-+ usecs = mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
-+
- usecs += minstrel_mcs_groups[group].duration[rate];
- mr->cur_tp = MINSTREL_TRUNC((1000000 / usecs) * mr->probability);
- }
-@@ -231,10 +285,6 @@ minstrel_ht_update_stats(struct minstrel
- if (!mr->cur_tp)
- continue;
+@@ -407,7 +390,7 @@ static void ath_tx_complete_aggr(struct
-- /* ignore the lowest rate of each single-stream group */
-- if (!i && minstrel_mcs_groups[group].streams == 1)
-- continue;
+ tx_info = IEEE80211_SKB_CB(skb);
+
+- memcpy(rates, tx_info->control.rates, sizeof(rates));
++ memcpy(rates, bf->rates, sizeof(rates));
+
+ retries = ts->ts_longretry + 1;
+ for (i = 0; i < ts->ts_rateindex; i++)
+@@ -483,19 +466,19 @@ static void ath_tx_complete_aggr(struct
+ tx_info = IEEE80211_SKB_CB(skb);
+ fi = get_frame_info(skb);
+
+- if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, seqno))) {
++ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
++ /*
++ * Outside of the current BlockAck window,
++ * maybe part of a previous session
++ */
++ txfail = 1;
++ } else if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, seqno))) {
+ /* transmit completion, subframe is
+ * acked by block ack */
+ acked_cnt++;
+ } else if (!isaggr && txok) {
+ /* transmit completion */
+ acked_cnt++;
+- } else if (tid->state & AGGR_CLEANUP) {
+- /*
+- * cleanup in progress, just fail
+- * the un-acked sub-frames
+- */
+- txfail = 1;
+ } else if (flush) {
+ txpending = 1;
+ } else if (fi->retries < ATH_MAX_SW_RETRIES) {
+@@ -519,7 +502,7 @@ static void ath_tx_complete_aggr(struct
+ if (bf_next != NULL || !bf_last->bf_stale)
+ list_move_tail(&bf->list, &bf_head);
+
+- if (!txpending || (tid->state & AGGR_CLEANUP)) {
++ if (!txpending) {
+ /*
+ * complete the acked-ones/xretried ones; update
+ * block-ack window
+@@ -593,9 +576,6 @@ static void ath_tx_complete_aggr(struct
+ ath_txq_lock(sc, txq);
+ }
+
+- if (tid->state & AGGR_CLEANUP)
+- ath_tx_flush_tid(sc, tid);
-
- if ((mr->cur_tp > cur_prob_tp && mr->probability >
- MINSTREL_FRAC(3, 4)) || mr->probability > cur_prob) {
- mg->max_prob_rate = index;
-@@ -297,7 +347,7 @@ minstrel_ht_update_stats(struct minstrel
- }
+ rcu_read_unlock();
- static bool
--minstrel_ht_txstat_valid(struct ieee80211_tx_rate *rate)
-+minstrel_ht_txstat_valid(struct minstrel_priv *mp, struct ieee80211_tx_rate *rate)
+ if (needreset)
+@@ -612,6 +592,7 @@ static void ath_tx_process_buffer(struct
+ struct ath_tx_status *ts, struct ath_buf *bf,
+ struct list_head *bf_head)
{
- if (rate->idx < 0)
- return false;
-@@ -305,7 +355,13 @@ minstrel_ht_txstat_valid(struct ieee8021
- if (!rate->count)
- return false;
++ struct ieee80211_tx_info *info;
+ bool txok, flush;
+
+ txok = !(ts->ts_status & ATH9K_TXERR_MASK);
+@@ -623,8 +604,12 @@ static void ath_tx_process_buffer(struct
+ txq->axq_ampdu_depth--;
+
+ if (!bf_isampdu(bf)) {
+- if (!flush)
++ if (!flush) {
++ info = IEEE80211_SKB_CB(bf->bf_mpdu);
++ memcpy(info->control.rates, bf->rates,
++ sizeof(info->control.rates));
+ ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
++ }
+ ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
+ } else
+ ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
+@@ -668,7 +653,7 @@ static u32 ath_lookup_rate(struct ath_so
-- return !!(rate->flags & IEEE80211_TX_RC_MCS);
-+ if (rate->flags & IEEE80211_TX_RC_MCS)
-+ return true;
-+
-+ return rate->idx == mp->cck_rates[0] ||
-+ rate->idx == mp->cck_rates[1] ||
-+ rate->idx == mp->cck_rates[2] ||
-+ rate->idx == mp->cck_rates[3];
- }
+ skb = bf->bf_mpdu;
+ tx_info = IEEE80211_SKB_CB(skb);
+- rates = tx_info->control.rates;
++ rates = bf->rates;
- static void
-@@ -390,7 +446,6 @@ minstrel_ht_tx_status(void *priv, struct
- struct minstrel_rate_stats *rate, *rate2;
- struct minstrel_priv *mp = priv;
- bool last;
-- int group;
- int i;
+ /*
+ * Find the lowest frame length among the rate series that will have a
+@@ -736,8 +721,6 @@ static int ath_compute_num_delims(struct
+ bool first_subfrm)
+ {
+ #define FIRST_DESC_NDELIMS 60
+- struct sk_buff *skb = bf->bf_mpdu;
+- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+ u32 nsymbits, nsymbols;
+ u16 minlen;
+ u8 flags, rix;
+@@ -778,8 +761,8 @@ static int ath_compute_num_delims(struct
+ if (tid->an->mpdudensity == 0)
+ return ndelim;
+
+- rix = tx_info->control.rates[0].idx;
+- flags = tx_info->control.rates[0].flags;
++ rix = bf->rates[0].idx;
++ flags = bf->rates[0].flags;
+ width = (flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ? 1 : 0;
+ half_gi = (flags & IEEE80211_TX_RC_SHORT_GI) ? 1 : 0;
+
+@@ -858,6 +841,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ bf_first = bf;
+
+ if (!rl) {
++ ath_set_rates(tid->an->vif, tid->an->sta, bf);
+ aggr_limit = ath_lookup_rate(sc, bf, tid);
+ rl = 1;
+ }
+@@ -998,14 +982,14 @@ static void ath_buf_set_rate(struct ath_
- if (!msp->is_ht)
-@@ -419,13 +474,12 @@ minstrel_ht_tx_status(void *priv, struct
- if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
- mi->sample_packets += info->status.ampdu_len;
+ skb = bf->bf_mpdu;
+ tx_info = IEEE80211_SKB_CB(skb);
+- rates = tx_info->control.rates;
++ rates = bf->rates;
+ hdr = (struct ieee80211_hdr *)skb->data;
-- last = !minstrel_ht_txstat_valid(&ar[0]);
-+ last = !minstrel_ht_txstat_valid(mp, &ar[0]);
- for (i = 0; !last; i++) {
- last = (i == IEEE80211_TX_MAX_RATES - 1) ||
-- !minstrel_ht_txstat_valid(&ar[i + 1]);
-+ !minstrel_ht_txstat_valid(mp, &ar[i + 1]);
+ /* set dur_update_en for l-sig computation except for PS-Poll frames */
+ info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);
+ info->rtscts_rate = fi->rtscts_rate;
-- group = minstrel_ht_get_group_idx(&ar[i]);
-- rate = &mi->groups[group].rates[ar[i].idx % 8];
-+ rate = minstrel_ht_get_stats(mp, mi, &ar[i]);
+- for (i = 0; i < 4; i++) {
++ for (i = 0; i < ARRAY_SIZE(bf->rates); i++) {
+ bool is_40, is_sgi, is_sp;
+ int phy;
- if (last)
- rate->success += info->status.ampdu_ack_len;
-@@ -451,7 +505,8 @@ minstrel_ht_tx_status(void *priv, struct
+@@ -1224,9 +1208,6 @@ int ath_tx_aggr_start(struct ath_softc *
+ an = (struct ath_node *)sta->drv_priv;
+ txtid = ATH_AN_2_TID(an, tid);
- if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
- minstrel_ht_update_stats(mp, mi);
-- if (!(info->flags & IEEE80211_TX_CTL_AMPDU))
-+ if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
-+ mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
- minstrel_aggr_check(sta, skb);
+- if (txtid->state & (AGGR_CLEANUP | AGGR_ADDBA_COMPLETE))
+- return -EAGAIN;
+-
+ /* update ampdu factor/density, they may have changed. This may happen
+ * in HT IBSS when a beacon with HT-info is received after the station
+ * has already been added.
+@@ -1238,7 +1219,7 @@ int ath_tx_aggr_start(struct ath_softc *
+ an->mpdudensity = density;
}
- }
-@@ -467,6 +522,7 @@ minstrel_calc_retransmit(struct minstrel
- unsigned int ctime = 0;
- unsigned int t_slot = 9; /* FIXME */
- unsigned int ampdu_len = MINSTREL_TRUNC(mi->avg_ampdu_len);
-+ unsigned int overhead = 0, overhead_rtscts = 0;
- mr = minstrel_get_ratestats(mi, index);
- if (mr->probability < MINSTREL_FRAC(1, 10)) {
-@@ -488,9 +544,14 @@ minstrel_calc_retransmit(struct minstrel
- ctime += (t_slot * cw) >> 1;
- cw = min((cw << 1) | 1, mp->cw_max);
-
-+ if (index / MCS_GROUP_RATES != MINSTREL_CCK_GROUP) {
-+ overhead = mi->overhead;
-+ overhead_rtscts = mi->overhead_rtscts;
-+ }
-+
- /* Total TX time for data and Contention after first 2 tries */
-- tx_time = ctime + 2 * (mi->overhead + tx_time_data);
-- tx_time_rtscts = ctime + 2 * (mi->overhead_rtscts + tx_time_data);
-+ tx_time = ctime + 2 * (overhead + tx_time_data);
-+ tx_time_rtscts = ctime + 2 * (overhead_rtscts + tx_time_data);
-
- /* See how many more tries we can fit inside segment size */
- do {
-@@ -499,8 +560,8 @@ minstrel_calc_retransmit(struct minstrel
- cw = min((cw << 1) | 1, mp->cw_max);
-
- /* Total TX time after this try */
-- tx_time += ctime + mi->overhead + tx_time_data;
-- tx_time_rtscts += ctime + mi->overhead_rtscts + tx_time_data;
-+ tx_time += ctime + overhead + tx_time_data;
-+ tx_time_rtscts += ctime + overhead_rtscts + tx_time_data;
-
- if (tx_time_rtscts < mp->segment_size)
- mr->retry_count_rtscts++;
-@@ -530,9 +591,16 @@ minstrel_ht_set_rate(struct minstrel_pri
- else
- rate->count = mr->retry_count;
+- txtid->state |= AGGR_ADDBA_PROGRESS;
++ txtid->active = true;
+ txtid->paused = true;
+ *ssn = txtid->seq_start = txtid->seq_next;
+ txtid->bar_index = -1;
+@@ -1255,28 +1236,9 @@ void ath_tx_aggr_stop(struct ath_softc *
+ struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid);
+ struct ath_txq *txq = txtid->ac->txq;
-- rate->flags = IEEE80211_TX_RC_MCS | group->flags;
-+ rate->flags = 0;
- if (rtscts)
- rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS;
-+
-+ if (index / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
-+ rate->idx = mp->cck_rates[index % ARRAY_SIZE(mp->cck_rates)];
-+ return;
-+ }
-+
-+ rate->flags |= IEEE80211_TX_RC_MCS | group->flags;
- rate->idx = index % MCS_GROUP_RATES + (group->streams - 1) * MCS_GROUP_RATES;
+- if (txtid->state & AGGR_CLEANUP)
+- return;
+-
+- if (!(txtid->state & AGGR_ADDBA_COMPLETE)) {
+- txtid->state &= ~AGGR_ADDBA_PROGRESS;
+- return;
+- }
+-
+ ath_txq_lock(sc, txq);
++ txtid->active = false;
+ txtid->paused = true;
+-
+- /*
+- * If frames are still being transmitted for this TID, they will be
+- * cleaned up during tx completion. To prevent race conditions, this
+- * TID can only be reused after all in-progress subframes have been
+- * completed.
+- */
+- if (txtid->baw_head != txtid->baw_tail)
+- txtid->state |= AGGR_CLEANUP;
+- else
+- txtid->state &= ~AGGR_ADDBA_COMPLETE;
+-
+ ath_tx_flush_tid(sc, txtid);
+ ath_txq_unlock_complete(sc, txq);
}
-
-@@ -596,6 +664,22 @@ minstrel_get_sample_rate(struct minstrel
+@@ -1342,18 +1304,28 @@ void ath_tx_aggr_wakeup(struct ath_softc
+ }
}
- static void
-+minstrel_ht_check_cck_shortpreamble(struct minstrel_priv *mp,
-+ struct minstrel_ht_sta *mi, bool val)
-+{
-+ u8 supported = mi->groups[MINSTREL_CCK_GROUP].supported;
-+
-+ if (!supported || !mi->cck_supported_short)
-+ return;
+-void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
++void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta,
++ u16 tidno)
+ {
+- struct ath_atx_tid *txtid;
++ struct ath_atx_tid *tid;
+ struct ath_node *an;
++ struct ath_txq *txq;
+
+ an = (struct ath_node *)sta->drv_priv;
++ tid = ATH_AN_2_TID(an, tidno);
++ txq = tid->ac->txq;
+
+- txtid = ATH_AN_2_TID(an, tid);
+- txtid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
+- txtid->state |= AGGR_ADDBA_COMPLETE;
+- txtid->state &= ~AGGR_ADDBA_PROGRESS;
+- ath_tx_resume_tid(sc, txtid);
++ ath_txq_lock(sc, txq);
+
-+ if (supported & (mi->cck_supported_short << (val * 4)))
-+ return;
++ tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
++ tid->paused = false;
+
-+ supported ^= mi->cck_supported_short | (mi->cck_supported_short << 4);
-+ mi->groups[MINSTREL_CCK_GROUP].supported = supported;
-+}
++ if (!skb_queue_empty(&tid->buf_q)) {
++ ath_tx_queue_tid(txq, tid);
++ ath_txq_schedule(sc, txq);
++ }
+
-+static void
- minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
- struct ieee80211_tx_rate_control *txrc)
- {
-@@ -614,6 +698,7 @@ minstrel_ht_get_rate(void *priv, struct
- return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc);
++ ath_txq_unlock_complete(sc, txq);
+ }
- info->flags |= mi->tx_flags;
-+ minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble);
+ /********************/
+@@ -1743,6 +1715,7 @@ static void ath_tx_send_ampdu(struct ath
+ return;
+ }
- /* Don't use EAPOL frames for sampling on non-mrr hw */
- if (mp->hw->max_rates == 1 &&
-@@ -687,6 +772,30 @@ minstrel_ht_get_rate(void *priv, struct
++ ath_set_rates(tid->an->vif, tid->an->sta, bf);
+ bf->bf_state.bf_type = BUF_AMPDU;
+ INIT_LIST_HEAD(&bf_head);
+ list_add(&bf->list, &bf_head);
+@@ -1892,49 +1865,6 @@ static struct ath_buf *ath_tx_setup_buff
+ return bf;
}
- static void
-+minstrel_ht_update_cck(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+ struct ieee80211_supported_band *sband,
-+ struct ieee80211_sta *sta)
-+{
-+ int i;
-+
-+ if (sband->band != IEEE80211_BAND_2GHZ)
-+ return;
+-/* FIXME: tx power */
+-static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
+- struct ath_tx_control *txctl)
+-{
+- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+- struct ath_atx_tid *tid = NULL;
+- struct ath_buf *bf;
+- u8 tidno;
+-
+- if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
+- tidno = ieee80211_get_qos_ctl(hdr)[0] &
+- IEEE80211_QOS_CTL_TID_MASK;
+- tid = ATH_AN_2_TID(txctl->an, tidno);
+-
+- WARN_ON(tid->ac->txq != txctl->txq);
+- }
+-
+- if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
+- /*
+- * Try aggregation if it's a unicast data frame
+- * and the destination is HT capable.
+- */
+- ath_tx_send_ampdu(sc, tid, skb, txctl);
+- } else {
+- bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+- if (!bf) {
+- if (txctl->paprd)
+- dev_kfree_skb_any(skb);
+- else
+- ieee80211_free_txskb(sc->hw, skb);
+- return;
+- }
+-
+- bf->bf_state.bfs_paprd = txctl->paprd;
+-
+- if (txctl->paprd)
+- bf->bf_state.bfs_paprd_timestamp = jiffies;
+-
+- ath_tx_send_normal(sc, txctl->txq, tid, skb);
+- }
+-}
+-
+ /* Upon failure caller should free skb */
+ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
+ struct ath_tx_control *txctl)
+@@ -1945,8 +1875,11 @@ int ath_tx_start(struct ieee80211_hw *hw
+ struct ieee80211_vif *vif = info->control.vif;
+ struct ath_softc *sc = hw->priv;
+ struct ath_txq *txq = txctl->txq;
++ struct ath_atx_tid *tid = NULL;
++ struct ath_buf *bf;
+ int padpos, padsize;
+ int frmlen = skb->len + FCS_LEN;
++ u8 tidno;
+ int q;
+
+ /* NOTE: sta can be NULL according to net/mac80211.h */
+@@ -2002,8 +1935,41 @@ int ath_tx_start(struct ieee80211_hw *hw
+ txq->stopped = true;
+ }
+
+- ath_tx_start_dma(sc, skb, txctl);
++ if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
++ tidno = ieee80211_get_qos_ctl(hdr)[0] &
++ IEEE80211_QOS_CTL_TID_MASK;
++ tid = ATH_AN_2_TID(txctl->an, tidno);
+
++ WARN_ON(tid->ac->txq != txctl->txq);
++ }
+
-+ mi->cck_supported = 0;
-+ mi->cck_supported_short = 0;
-+ for (i = 0; i < 4; i++) {
-+ if (!rate_supported(sta, sband->band, mp->cck_rates[i]))
-+ continue;
++ if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
++ /*
++ * Try aggregation if it's a unicast data frame
++ * and the destination is HT capable.
++ */
++ ath_tx_send_ampdu(sc, tid, skb, txctl);
++ goto out;
++ }
+
-+ mi->cck_supported |= BIT(i);
-+ if (sband->bitrates[i].flags & IEEE80211_RATE_SHORT_PREAMBLE)
-+ mi->cck_supported_short |= BIT(i);
++ bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
++ if (!bf) {
++ if (txctl->paprd)
++ dev_kfree_skb_any(skb);
++ else
++ ieee80211_free_txskb(sc->hw, skb);
++ goto out;
+ }
+
-+ mi->groups[MINSTREL_CCK_GROUP].supported = mi->cck_supported;
-+}
++ bf->bf_state.bfs_paprd = txctl->paprd;
+
-+static void
- minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
- struct ieee80211_sta *sta, void *priv_sta)
- {
-@@ -706,7 +815,7 @@ minstrel_ht_update_caps(void *priv, stru
- goto use_legacy;
++ if (txctl->paprd)
++ bf->bf_state.bfs_paprd_timestamp = jiffies;
++
++ ath_set_rates(vif, sta, bf);
++ ath_tx_send_normal(sc, txctl->txq, tid, skb);
++
++out:
+ ath_txq_unlock(sc, txq);
- BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) !=
-- MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS);
-+ MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS + 1);
+ return 0;
+@@ -2408,12 +2374,10 @@ void ath_tx_node_init(struct ath_softc *
+ tid->baw_head = tid->baw_tail = 0;
+ tid->sched = false;
+ tid->paused = false;
+- tid->state &= ~AGGR_CLEANUP;
++ tid->active = false;
+ __skb_queue_head_init(&tid->buf_q);
+ acno = TID_TO_WME_AC(tidno);
+ tid->ac = &an->ac[acno];
+- tid->state &= ~AGGR_ADDBA_COMPLETE;
+- tid->state &= ~AGGR_ADDBA_PROGRESS;
+ }
- msp->is_ht = true;
- memset(mi, 0, sizeof(*mi));
-@@ -742,6 +851,11 @@ minstrel_ht_update_caps(void *priv, stru
- u16 req = 0;
+ for (acno = 0, ac = &an->ac[acno];
+@@ -2450,9 +2414,9 @@ void ath_tx_node_cleanup(struct ath_soft
+ }
- mi->groups[i].supported = 0;
-+ if (i == MINSTREL_CCK_GROUP) {
-+ minstrel_ht_update_cck(mp, mi, sband, sta);
-+ continue;
-+ }
-+
- if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) {
- if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
- req |= IEEE80211_HT_CAP_SGI_40;
---- a/net/mac80211/rc80211_minstrel_ht.h
-+++ b/net/mac80211/rc80211_minstrel_ht.h
-@@ -107,8 +107,11 @@ struct minstrel_ht_sta {
- /* current MCS group to be sampled */
- u8 sample_group;
+ ath_tid_drain(sc, txq, tid);
+- tid->state &= ~AGGR_ADDBA_COMPLETE;
+- tid->state &= ~AGGR_CLEANUP;
++ tid->active = false;
-+ u8 cck_supported;
-+ u8 cck_supported_short;
+ ath_txq_unlock(sc, txq);
+ }
+ }
+
- /* MCS rate group info and statistics */
-- struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS];
-+ struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS + 1];
- };
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -124,7 +124,7 @@ static bool ath_rx_edma_buf_link(struct
- struct minstrel_ht_sta_priv {
---- a/net/mac80211/rc80211_minstrel_ht_debugfs.c
-+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
-@@ -15,13 +15,76 @@
- #include "rc80211_minstrel.h"
- #include "rc80211_minstrel_ht.h"
+ SKB_CB_ATHBUF(skb) = bf;
+ ath9k_hw_addrxbuf_edma(ah, bf->bf_buf_addr, qtype);
+- skb_queue_tail(&rx_edma->rx_fifo, skb);
++ __skb_queue_tail(&rx_edma->rx_fifo, skb);
-+static char *
-+minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)
-+{
-+ unsigned int max_mcs = MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS;
-+ const struct mcs_group *mg;
-+ unsigned int j, tp, prob, eprob;
-+ char htmode = '2';
-+ char gimode = 'L';
-+
-+ if (!mi->groups[i].supported)
-+ return p;
-+
-+ mg = &minstrel_mcs_groups[i];
-+ if (mg->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-+ htmode = '4';
-+ if (mg->flags & IEEE80211_TX_RC_SHORT_GI)
-+ gimode = 'S';
-+
-+ for (j = 0; j < MCS_GROUP_RATES; j++) {
-+ struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
-+ static const int bitrates[4] = { 10, 20, 55, 110 };
-+ int idx = i * MCS_GROUP_RATES + j;
-+
-+ if (!(mi->groups[i].supported & BIT(j)))
-+ continue;
-+
-+ if (i == max_mcs)
-+ p += sprintf(p, "CCK/%cP ", j < 4 ? 'L' : 'S');
-+ else
-+ p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);
-+
-+ *(p++) = (idx == mi->max_tp_rate) ? 'T' : ' ';
-+ *(p++) = (idx == mi->max_tp_rate2) ? 't' : ' ';
-+ *(p++) = (idx == mi->max_prob_rate) ? 'P' : ' ';
-+
-+ if (i == max_mcs) {
-+ int r = bitrates[j % 4];
-+ p += sprintf(p, " %2u.%1uM", r / 10, r % 10);
-+ } else {
-+ p += sprintf(p, " MCS%-2u", (mg->streams - 1) *
-+ MCS_GROUP_RATES + j);
-+ }
-+
-+ tp = mr->cur_tp / 10;
-+ prob = MINSTREL_TRUNC(mr->cur_prob * 1000);
-+ eprob = MINSTREL_TRUNC(mr->probability * 1000);
-+
-+ p += sprintf(p, " %6u.%1u %6u.%1u %6u.%1u "
-+ "%3u %3u(%3u) %8llu %8llu\n",
-+ tp / 10, tp % 10,
-+ eprob / 10, eprob % 10,
-+ prob / 10, prob % 10,
-+ mr->retry_count,
-+ mr->last_success,
-+ mr->last_attempts,
-+ (unsigned long long)mr->succ_hist,
-+ (unsigned long long)mr->att_hist);
-+ }
-+
-+ return p;
-+}
-+
- static int
- minstrel_ht_stats_open(struct inode *inode, struct file *file)
- {
- struct minstrel_ht_sta_priv *msp = inode->i_private;
- struct minstrel_ht_sta *mi = &msp->ht;
- struct minstrel_debugfs_info *ms;
-- unsigned int i, j, tp, prob, eprob;
-+ unsigned int i;
-+ unsigned int max_mcs = MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS;
- char *p;
- int ret;
+ return true;
+ }
+@@ -155,7 +155,7 @@ static void ath_rx_remove_buffer(struct
-@@ -38,50 +101,13 @@ minstrel_ht_stats_open(struct inode *ino
+ rx_edma = &sc->rx.rx_edma[qtype];
- file->private_data = ms;
- p = ms->buf;
-- p += sprintf(p, "type rate throughput ewma prob this prob "
-- "this succ/attempt success attempts\n");
-- for (i = 0; i < MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS; i++) {
-- char htmode = '2';
-- char gimode = 'L';
--
-- if (!mi->groups[i].supported)
-- continue;
--
-- if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-- htmode = '4';
-- if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI)
-- gimode = 'S';
+- while ((skb = skb_dequeue(&rx_edma->rx_fifo)) != NULL) {
++ while ((skb = __skb_dequeue(&rx_edma->rx_fifo)) != NULL) {
+ bf = SKB_CB_ATHBUF(skb);
+ BUG_ON(!bf);
+ list_add_tail(&bf->list, &sc->rx.rxbuf);
+@@ -1287,13 +1287,13 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ goto requeue_drop_frag;
+ }
+
+- bf->bf_mpdu = requeue_skb;
+- bf->bf_buf_addr = new_buf_addr;
-
-- for (j = 0; j < MCS_GROUP_RATES; j++) {
-- struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
-- int idx = i * MCS_GROUP_RATES + j;
-+ p += sprintf(p, "type rate throughput ewma prob this prob "
-+ "retry this succ/attempt success attempts\n");
+ /* Unmap the frame */
+ dma_unmap_single(sc->dev, bf->bf_buf_addr,
+ common->rx_bufsize, dma_type);
-- if (!(mi->groups[i].supported & BIT(j)))
-- continue;
-+ p = minstrel_ht_stats_dump(mi, max_mcs, p);
-+ for (i = 0; i < max_mcs; i++)
-+ p = minstrel_ht_stats_dump(mi, i, p);
++ bf->bf_mpdu = requeue_skb;
++ bf->bf_buf_addr = new_buf_addr;
++
+ skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
+ if (ah->caps.rx_status_len)
+ skb_pull(skb, ah->caps.rx_status_len);
+--- a/net/wireless/core.c
++++ b/net/wireless/core.c
+@@ -885,7 +885,6 @@ void cfg80211_leave(struct cfg80211_regi
+ #endif
+ __cfg80211_disconnect(rdev, dev,
+ WLAN_REASON_DEAUTH_LEAVING, true);
+- cfg80211_mlme_down(rdev, dev);
+ wdev_unlock(wdev);
+ break;
+ case NL80211_IFTYPE_MESH_POINT:
+--- a/net/wireless/sme.c
++++ b/net/wireless/sme.c
+@@ -961,7 +961,7 @@ int __cfg80211_disconnect(struct cfg8021
+ /* was it connected by userspace SME? */
+ if (!wdev->conn) {
+ cfg80211_mlme_down(rdev, dev);
+- return 0;
++ goto disconnect;
+ }
-- p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);
--
-- *(p++) = (idx == mi->max_tp_rate) ? 'T' : ' ';
-- *(p++) = (idx == mi->max_tp_rate2) ? 't' : ' ';
-- *(p++) = (idx == mi->max_prob_rate) ? 'P' : ' ';
-- p += sprintf(p, "MCS%-2u", (minstrel_mcs_groups[i].streams - 1) *
-- MCS_GROUP_RATES + j);
--
-- tp = mr->cur_tp / 10;
-- prob = MINSTREL_TRUNC(mr->cur_prob * 1000);
-- eprob = MINSTREL_TRUNC(mr->probability * 1000);
+ if (wdev->sme_state == CFG80211_SME_CONNECTING &&
+@@ -987,6 +987,7 @@ int __cfg80211_disconnect(struct cfg8021
+ return err;
+ }
+
++ disconnect:
+ if (wdev->sme_state == CFG80211_SME_CONNECTED)
+ __cfg80211_disconnected(dev, NULL, 0, 0, false);
+ else if (wdev->sme_state == CFG80211_SME_CONNECTING)
+--- a/drivers/net/wireless/ath/ath9k/rc.c
++++ b/drivers/net/wireless/ath/ath9k/rc.c
+@@ -1227,10 +1227,7 @@ static bool ath_tx_aggr_check(struct ath
+ return false;
+
+ txtid = ATH_AN_2_TID(an, tidno);
-
-- p += sprintf(p, " %6u.%1u %6u.%1u %6u.%1u "
-- "%3u(%3u) %8llu %8llu\n",
-- tp / 10, tp % 10,
-- eprob / 10, eprob % 10,
-- prob / 10, prob % 10,
-- mr->last_success,
-- mr->last_attempts,
-- (unsigned long long)mr->succ_hist,
-- (unsigned long long)mr->att_hist);
-- }
-- }
- p += sprintf(p, "\nTotal packet count:: ideal %d "
- "lookaround %d\n",
- max(0, (int) mi->total_packets - (int) mi->sample_packets),
---- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-@@ -1067,15 +1067,19 @@ static bool ath9k_rx_prepare(struct ath9
-
- last_rssi = priv->rx.last_rssi;
-
-- if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-- rxbuf->rxstatus.rs_rssi = ATH_EP_RND(last_rssi,
-- ATH_RSSI_EP_MULTIPLIER);
-+ if (ieee80211_is_beacon(hdr->frame_control) &&
-+ !is_zero_ether_addr(common->curbssid) &&
-+ ether_addr_equal(hdr->addr3, common->curbssid)) {
-+ s8 rssi = rxbuf->rxstatus.rs_rssi;
-
-- if (rxbuf->rxstatus.rs_rssi < 0)
-- rxbuf->rxstatus.rs_rssi = 0;
-+ if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-+ rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
-
-- if (ieee80211_is_beacon(fc))
-- priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
-+ if (rssi < 0)
-+ rssi = 0;
-+
-+ priv->ah->stats.avgbrssi = rssi;
-+ }
+- if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))
+- return true;
+- return false;
++ return !txtid->active;
+ }
+
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -334,7 +334,8 @@ static void ar9003_hw_spur_ofdm(struct a
+ REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,
+ AR_PHY_SPUR_REG_EN_VIT_SPUR_RSSI, 1);
+
+- if (REG_READ_FIELD(ah, AR_PHY_MODE,
++ if (!AR_SREV_9340(ah) &&
++ REG_READ_FIELD(ah, AR_PHY_MODE,
+ AR_PHY_MODE_DYNAMIC) == 0x1)
+ REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,
+ AR_PHY_SPUR_REG_ENABLE_NF_RSSI_SPUR_MIT, 1);
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -410,7 +410,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw
+
+ REG_WRITE(ah, AR_QMISC(q), AR_Q_MISC_DCU_EARLY_TERM_REQ);
+
+- if (AR_SREV_9340(ah))
++ if (AR_SREV_9340(ah) && !AR_SREV_9340_13_OR_LATER(ah))
+ REG_WRITE(ah, AR_DMISC(q),
+ AR_D_MISC_CW_BKOFF_EN | AR_D_MISC_FRAG_WAIT_EN | 0x1);
+ else
+--- a/net/mac80211/driver-ops.h
++++ b/net/mac80211/driver-ops.h
+@@ -146,7 +146,8 @@ static inline int drv_add_interface(stru
+
+ if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+ (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
+- !(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF))))
++ !(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF) &&
++ !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))))
+ return -EINVAL;
- rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
- rx_status->band = hw->conf.channel->band;
+ trace_drv_add_interface(local, sdata);