---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -320,6 +320,10 @@ static void b43_wireless_core_exit(struc
- static int b43_wireless_core_init(struct b43_wldev *dev);
- static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev);
- static int b43_wireless_core_start(struct b43_wldev *dev);
-+static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
-+ struct ieee80211_vif *vif,
-+ struct ieee80211_bss_conf *conf,
-+ u32 changed);
-
- static int b43_ratelimit(struct b43_wl *wl)
- {
-@@ -3754,14 +3758,24 @@ static int b43_op_config(struct ieee8021
- struct ieee80211_conf *conf = &hw->conf;
- int antenna;
- int err = 0;
-+ bool reload_bss = false;
-
- mutex_lock(&wl->mutex);
-
-+ dev = wl->current_dev;
-+
- /* Switch the band (if necessary). This might change the active core. */
- err = b43_switch_band(wl, conf->channel);
- if (err)
- goto out_unlock_mutex;
-- dev = wl->current_dev;
-+
-+ /* Need to reload all settings if the core changed */
-+ if (dev != wl->current_dev) {
-+ dev = wl->current_dev;
-+ changed = ~0;
-+ reload_bss = true;
-+ }
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1171,7 +1171,7 @@ ath5k_check_ibss_tsf(struct ath5k_hw *ah
+
+ if (ieee80211_is_beacon(mgmt->frame_control) &&
+ le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS &&
+- memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) == 0) {
++ compare_ether_addr(mgmt->bssid, common->curbssid) == 0) {
+ /*
+ * Received an IBSS beacon with the same BSSID. Hardware *must*
+ * have updated the local TSF. We have to work around various
+@@ -1235,7 +1235,7 @@ ath5k_update_beacon_rssi(struct ath5k_hw
+
+ /* only beacons from our BSSID */
+ if (!ieee80211_is_beacon(mgmt->frame_control) ||
+- memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) != 0)
++ compare_ether_addr(mgmt->bssid, common->curbssid) != 0)
+ return;
+
+ ewma_add(&ah->ah_beacon_rssi_avg, rssi);
+@@ -2416,6 +2416,22 @@ ath5k_tx_complete_poll_work(struct work_
+ * Initialization routines *
+ \*************************/
+
++static const struct ieee80211_iface_limit if_limits[] = {
++ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) },
++ { .max = 4, .types =
++#ifdef CONFIG_MAC80211_MESH
++ BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
++ BIT(NL80211_IFTYPE_AP) },
++};
++
++static const struct ieee80211_iface_combination if_comb = {
++ .limits = if_limits,
++ .n_limits = ARRAY_SIZE(if_limits),
++ .max_interfaces = 2048,
++ .num_different_channels = 1,
++};
+
- phy = &dev->phy;
+ int __devinit
+ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
+ {
+@@ -2437,6 +2453,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const
+ BIT(NL80211_IFTYPE_ADHOC) |
+ BIT(NL80211_IFTYPE_MESH_POINT);
+
++ hw->wiphy->iface_combinations = &if_comb;
++ hw->wiphy->n_iface_combinations = 1;
++
+ /* SW support for IBSS_RSN is provided by mac80211 */
+ hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
+--- a/drivers/net/wireless/ath/ath9k/ani.c
++++ b/drivers/net/wireless/ath/ath9k/ani.c
+@@ -274,7 +274,9 @@ static void ath9k_hw_set_ofdm_nil(struct
+ aniState->rssiThrLow, aniState->rssiThrHigh);
+
+ if (aniState->update_ani)
+- aniState->ofdmNoiseImmunityLevel = immunityLevel;
++ aniState->ofdmNoiseImmunityLevel =
++ (immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ?
++ immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL;
+
+ entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+@@ -340,7 +342,9 @@ static void ath9k_hw_set_cck_nil(struct
+ immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
+
+ if (aniState->update_ani)
+- aniState->cckNoiseImmunityLevel = immunityLevel;
++ aniState->cckNoiseImmunityLevel =
++ (immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ?
++ immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL;
+
+ entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -618,19 +618,10 @@ static void ar5008_hw_init_bb(struct ath
+ u32 synthDelay;
+
+ synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+- if (IS_CHAN_B(chan))
+- synthDelay = (4 * synthDelay) / 22;
+- else
+- synthDelay /= 10;
+-
+- if (IS_CHAN_HALF_RATE(chan))
+- synthDelay *= 2;
+- else if (IS_CHAN_QUARTER_RATE(chan))
+- synthDelay *= 4;
- if (conf_is_ht(conf))
-@@ -3822,6 +3836,9 @@ out_mac_enable:
- out_unlock_mutex:
- mutex_unlock(&wl->mutex);
+ REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-+ if (wl->vif && reload_bss)
-+ b43_op_bss_info_changed(hw, wl->vif, &wl->vif->bss_conf, ~0);
-+
- return err;
+- udelay(synthDelay + BASE_ACTIVATE_DELAY);
++ ath9k_hw_synth_delay(ah, chan, synthDelay);
}
-@@ -3910,7 +3927,8 @@ static void b43_op_bss_info_changed(stru
- if (changed & BSS_CHANGED_BEACON_INT &&
- (b43_is_mode(wl, NL80211_IFTYPE_AP) ||
- b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) ||
-- b43_is_mode(wl, NL80211_IFTYPE_ADHOC)))
-+ b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) &&
-+ conf->beacon_int)
- b43_set_beacon_int(dev, conf->beacon_int);
+ static void ar5008_hw_init_chain_masks(struct ath_hw *ah)
+@@ -868,7 +859,7 @@ static int ar5008_hw_process_ini(struct
+ ar5008_hw_set_channel_regs(ah, chan);
+ ar5008_hw_init_chain_masks(ah);
+ ath9k_olc_init(ah);
+- ath9k_hw_apply_txpower(ah, chan);
++ ath9k_hw_apply_txpower(ah, chan, false);
+
+ /* Write analog registers */
+ if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) {
+@@ -948,12 +939,8 @@ static bool ar5008_hw_rfbus_req(struct a
+ static void ar5008_hw_rfbus_done(struct ath_hw *ah)
+ {
+ u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+- if (IS_CHAN_B(ah->curchan))
+- synthDelay = (4 * synthDelay) / 22;
+- else
+- synthDelay /= 10;
- if (changed & BSS_CHANGED_BASIC_RATES)
-@@ -4691,6 +4709,9 @@ static int b43_op_add_interface(struct i
- out_mutex_unlock:
- mutex_unlock(&wl->mutex);
+- udelay(synthDelay + BASE_ACTIVATE_DELAY);
++ ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
-+ if (err == 0)
-+ b43_op_bss_info_changed(hw, vif, &vif->bss_conf, ~0);
-+
- return err;
+ REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
}
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -1000,10 +1000,12 @@ static bool ar9003_hw_init_cal(struct at
+ if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+ ar9003_mci_init_cal_req(ah, &is_reusable);
+
+- 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 (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
++ 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);
++ }
-@@ -4761,6 +4782,9 @@ static int b43_op_start(struct ieee80211
- out_mutex_unlock:
- mutex_unlock(&wl->mutex);
+ skip_tx_iqcal:
+ if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
+--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -54,7 +54,7 @@ void ar9003_paprd_enable(struct ath_hw *
-+ /* reload configuration */
-+ b43_op_config(hw, ~0);
-+
- return err;
+ if (val) {
+ ah->paprd_table_write_done = true;
+- ath9k_hw_apply_txpower(ah, chan);
++ ath9k_hw_apply_txpower(ah, chan, false);
+ }
+
+ REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -524,22 +524,10 @@ static void ar9003_hw_init_bb(struct ath
+ * Value is in 100ns increments.
+ */
+ synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+- if (IS_CHAN_B(chan))
+- synthDelay = (4 * synthDelay) / 22;
+- else
+- synthDelay /= 10;
+
+ /* Activate the PHY (includes baseband activate + synthesizer on) */
+ REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+-
+- /*
+- * There is an issue if the AP starts the calibration before
+- * the base band timeout completes. This could result in the
+- * rx_clear false triggering. As a workaround we add delay an
+- * extra BASE_ACTIVATE_DELAY usecs to ensure this condition
+- * does not happen.
+- */
+- udelay(synthDelay + BASE_ACTIVATE_DELAY);
++ ath9k_hw_synth_delay(ah, chan, synthDelay);
}
-@@ -4917,10 +4941,18 @@ out:
- if (err)
- wl->current_dev = NULL; /* Failed to init the dev. */
- mutex_unlock(&wl->mutex);
-- if (err)
-+
-+ if (err) {
- b43err(wl, "Controller restart FAILED\n");
+ static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+@@ -690,7 +678,7 @@ static int ar9003_hw_process_ini(struct
+ ar9003_hw_override_ini(ah);
+ ar9003_hw_set_channel_regs(ah, chan);
+ ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
+- ath9k_hw_apply_txpower(ah, chan);
++ ath9k_hw_apply_txpower(ah, chan, false);
+
+ if (AR_SREV_9462(ah)) {
+ if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
+@@ -721,6 +709,14 @@ static void ar9003_hw_set_rfmode(struct
+
+ if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
++ if (IS_CHAN_QUARTER_RATE(chan))
++ rfMode |= AR_PHY_MODE_QUARTER;
++ if (IS_CHAN_HALF_RATE(chan))
++ rfMode |= AR_PHY_MODE_HALF;
++
++ if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
++ REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
++ AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);
+
+ REG_WRITE(ah, AR_PHY_MODE, rfMode);
+ }
+@@ -791,12 +787,8 @@ static bool ar9003_hw_rfbus_req(struct a
+ static void ar9003_hw_rfbus_done(struct ath_hw *ah)
+ {
+ u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+- if (IS_CHAN_B(ah->curchan))
+- synthDelay = (4 * synthDelay) / 22;
- else
-- b43info(wl, "Controller restarted\n");
+- synthDelay /= 10;
+
+- udelay(synthDelay + BASE_ACTIVATE_DELAY);
++ ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
+
+ REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+@@ -468,6 +468,9 @@
+ #define AR_PHY_ADDAC_PARA_CTL (AR_SM_BASE + 0x150)
+ #define AR_PHY_XPA_CFG (AR_SM_BASE + 0x158)
+
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW 3
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW_S 0
++
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A 0x0001FC00
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A_S 10
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A 0x3FF
+--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+@@ -1115,9 +1115,9 @@ static const u32 ar9462_2p0_mac_core[][2
+ {0x000081f8, 0x00000000},
+ {0x000081fc, 0x00000000},
+ {0x00008240, 0x00100000},
+- {0x00008244, 0x0010f400},
++ {0x00008244, 0x0010f424},
+ {0x00008248, 0x00000800},
+- {0x0000824c, 0x0001e800},
++ {0x0000824c, 0x0001e848},
+ {0x00008250, 0x00000000},
+ {0x00008254, 0x00000000},
+ {0x00008258, 0x00000000},
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -370,7 +370,7 @@ struct ath_vif {
+ * number of beacon intervals, the game's up.
+ */
+ #define BSTUCK_THRESH 9
+-#define ATH_BCBUF 4
++#define ATH_BCBUF 8
+ #define ATH_DEFAULT_BINTVAL 100 /* TU */
+ #define ATH_DEFAULT_BMISS_LIMIT 10
+ #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_
+ info.txpower = MAX_RATE_POWER;
+ info.keyix = ATH9K_TXKEYIX_INVALID;
+ info.keytype = ATH9K_KEY_TYPE_CLEAR;
+- info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ;
++ info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_CLRDMASK;
+
+ info.buf_addr[0] = bf->bf_buf_addr;
+ info.buf_len[0] = roundup(skb->len, 4);
+@@ -359,6 +359,11 @@ void ath_beacon_tasklet(unsigned long da
+ int slot;
+ u32 bfaddr, bc = 0;
+
++ if (work_pending(&sc->hw_reset_work)) {
++ ath_dbg(common, RESET,
++ "reset work is pending, skip beaconing now\n");
+ return;
+ }
+ /*
+ * Check if the previous beacon has gone out. If
+ * not don't try to post another, skip this period
+@@ -369,6 +374,9 @@ void ath_beacon_tasklet(unsigned long da
+ if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
+ sc->beacon.bmisscnt++;
+
++ if (!ath9k_hw_check_alive(ah))
++ ieee80211_queue_work(sc->hw, &sc->hw_check_work);
++
+ if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
+ ath_dbg(common, BSTUCK,
+ "missed %u consecutive beacons\n",
+@@ -378,6 +386,7 @@ void ath_beacon_tasklet(unsigned long da
+ ath9k_hw_bstuck_nfcal(ah);
+ } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
+ ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
++ sc->beacon.bmisscnt = 0;
+ sc->sc_flags |= SC_OP_TSF_RESET;
+ ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+ }
+@@ -650,6 +659,8 @@ static void ath_beacon_config_adhoc(stru
+ u32 tsf, intval, nexttbtt;
+
+ ath9k_reset_beacon_status(sc);
++ if (!(sc->sc_flags & SC_OP_BEACONS))
++ ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp);
+
+ intval = TU_TO_USEC(conf->beacon_interval);
+ tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);
+--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
++++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+@@ -824,6 +824,8 @@ static void ath9k_hw_ar9287_set_txpower(
+ regulatory->max_power_level = ratesArray[i];
+ }
+
++ ath9k_hw_update_regulatory_maxpower(ah);
+
-+ /* reload configuration */
-+ b43_op_config(wl->hw, ~0);
-+ if (wl->vif)
-+ b43_op_bss_info_changed(wl->hw, wl->vif, &wl->vif->bss_conf, ~0);
+ if (test)
+ return;
+
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc)
+ {
+ int ret;
+
++ if (AR_SREV_9100(sc->sc_ah))
++ return;
+
-+ b43info(wl, "Controller restarted\n");
+ if (sc->sc_ah->led_pin < 0) {
+ if (AR_SREV_9287(sc->sc_ah))
+ sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -142,6 +142,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3
}
+ EXPORT_SYMBOL(ath9k_hw_wait);
- static int b43_setup_bands(struct b43_wldev *dev,
++void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
++ int hw_delay)
++{
++ if (IS_CHAN_B(chan))
++ hw_delay = (4 * hw_delay) / 22;
++ else
++ hw_delay /= 10;
++
++ if (IS_CHAN_HALF_RATE(chan))
++ hw_delay *= 2;
++ else if (IS_CHAN_QUARTER_RATE(chan))
++ hw_delay *= 4;
++
++ udelay(hw_delay + BASE_ACTIVATE_DELAY);
++}
++
+ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+ int column, unsigned int *writecnt)
+ {
+@@ -388,8 +404,8 @@ static void ath9k_hw_init_config(struct
+ {
+ int i;
+
+- ah->config.dma_beacon_response_time = 2;
+- ah->config.sw_beacon_response_time = 10;
++ ah->config.dma_beacon_response_time = 1;
++ ah->config.sw_beacon_response_time = 6;
+ ah->config.additional_swba_backoff = 0;
+ ah->config.ack_6mb = 0x0;
+ ah->config.cwm_ignore_extcca = 0;
+@@ -971,7 +987,7 @@ void ath9k_hw_init_global_settings(struc
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_conf *conf = &common->hw->conf;
+ const struct ath9k_channel *chan = ah->curchan;
+- int acktimeout, ctstimeout;
++ int acktimeout, ctstimeout, ack_offset = 0;
+ int slottime;
+ int sifstime;
+ int rx_lat = 0, tx_lat = 0, eifs = 0;
+@@ -992,6 +1008,11 @@ void ath9k_hw_init_global_settings(struc
+ rx_lat = 37;
+ tx_lat = 54;
+
++ if (IS_CHAN_5GHZ(chan))
++ sifstime = 16;
++ else
++ sifstime = 10;
++
+ if (IS_CHAN_HALF_RATE(chan)) {
+ eifs = 175;
+ rx_lat *= 2;
+@@ -999,8 +1020,9 @@ void ath9k_hw_init_global_settings(struc
+ if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ tx_lat += 11;
+
++ sifstime *= 2;
++ ack_offset = 16;
+ slottime = 13;
+- sifstime = 32;
+ } else if (IS_CHAN_QUARTER_RATE(chan)) {
+ eifs = 340;
+ rx_lat = (rx_lat * 4) - 1;
+@@ -1008,8 +1030,9 @@ void ath9k_hw_init_global_settings(struc
+ if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ tx_lat += 22;
+
++ sifstime *= 4;
++ ack_offset = 32;
+ slottime = 21;
+- sifstime = 64;
+ } else {
+ if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
+ eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO;
+@@ -1023,14 +1046,10 @@ void ath9k_hw_init_global_settings(struc
+ tx_lat = MS(reg, AR_USEC_TX_LAT);
+
+ slottime = ah->slottime;
+- if (IS_CHAN_5GHZ(chan))
+- sifstime = 16;
+- else
+- sifstime = 10;
+ }
+
+ /* As defined by IEEE 802.11-2007 17.3.8.6 */
+- acktimeout = slottime + sifstime + 3 * ah->coverage_class;
++ acktimeout = slottime + sifstime + 3 * ah->coverage_class + ack_offset;
+ ctstimeout = acktimeout;
+
+ /*
+@@ -1040,7 +1059,8 @@ void ath9k_hw_init_global_settings(struc
+ * BA frames in some implementations, but it has been found to fix ACK
+ * timeout issues in other cases as well.
+ */
+- if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
++ if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ &&
++ !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
+ acktimeout += 64 - sifstime - ah->slottime;
+ ctstimeout += 48 - sifstime - ah->slottime;
+ }
+@@ -1420,6 +1440,10 @@ static bool ath9k_hw_channel_change(stru
+ CHANNEL_5GHZ));
+ mode_diff = (chan->chanmode != ah->curchan->chanmode);
+
++ if ((ah->curchan->channelFlags | chan->channelFlags) &
++ (CHANNEL_HALF | CHANNEL_QUARTER))
++ return false;
++
+ for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
+ if (ath9k_hw_numtxpending(ah, qnum)) {
+ ath_dbg(common, QUEUE,
+@@ -1453,7 +1477,7 @@ static bool ath9k_hw_channel_change(stru
+ return false;
+ }
+ ath9k_hw_set_clockrate(ah);
+- ath9k_hw_apply_txpower(ah, chan);
++ ath9k_hw_apply_txpower(ah, chan, false);
+ ath9k_hw_rfbus_done(ah);
+
+ if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
+@@ -2724,7 +2748,8 @@ static int get_antenna_gain(struct ath_h
+ return ah->eep_ops->get_eeprom(ah, gain_param);
+ }
+
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan)
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++ bool test)
+ {
+ struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
+ struct ieee80211_channel *channel;
+@@ -2745,7 +2770,7 @@ void ath9k_hw_apply_txpower(struct ath_h
+
+ ah->eep_ops->set_txpower(ah, chan,
+ ath9k_regd_get_ctl(reg, chan),
+- ant_reduction, new_pwr, false);
++ ant_reduction, new_pwr, test);
+ }
+
+ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
+@@ -2758,7 +2783,7 @@ void ath9k_hw_set_txpowerlimit(struct at
+ if (test)
+ channel->max_power = MAX_RATE_POWER / 2;
+
+- ath9k_hw_apply_txpower(ah, chan);
++ ath9k_hw_apply_txpower(ah, chan, test);
+
+ if (test)
+ channel->max_power = DIV_ROUND_UP(reg->max_power_level, 2);
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -923,6 +923,8 @@ void ath9k_hw_set_gpio(struct ath_hw *ah
+ void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
+
+ /* General Operation */
++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,
+ int column, unsigned int *writecnt);
+@@ -976,7 +978,8 @@ void ath9k_hw_name(struct ath_hw *ah, ch
+ /* PHY */
+ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
+ u32 *coef_mantissa, u32 *coef_exponent);
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan);
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++ bool test);
+
+ /*
+ * Code Specific to AR5008, AR9001 or AR9002,
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel
+
+ void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
+ {
++ int maxdelay = 1000;
+ int i, q;
+
++ if (ah->curchan) {
++ if (IS_CHAN_HALF_RATE(ah->curchan))
++ maxdelay *= 2;
++ else if (IS_CHAN_QUARTER_RATE(ah->curchan))
++ maxdelay *= 4;
++ }
++
+ REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M);
+
+ REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF);
+@@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw
+ REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
+
+ for (q = 0; q < AR_NUM_QCU; q++) {
+- for (i = 0; i < 1000; i++) {
++ for (i = 0; i < maxdelay; i++) {
+ if (i)
+ udelay(5);
+
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -692,17 +692,6 @@ void ath9k_tasklet(unsigned long data)
+ goto out;
+ }
+
+- /*
+- * Only run the baseband hang check if beacons stop working in AP or
+- * IBSS mode, because it has a high false positive rate. For station
+- * mode it should not be necessary, since the upper layers will detect
+- * this through a beacon miss automatically and the following channel
+- * change will trigger a hardware reset anyway
+- */
+- if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
+- !ath9k_hw_check_alive(ah))
+- ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+-
+ if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
+ /*
+ * TSF sync does not look correct; remain awake to sync with
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
-@@ -184,6 +184,8 @@ static void ieee80211_send_addba_resp(st
- memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
- else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+@@ -200,6 +200,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);
+ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
+ memcpy(mgmt->bssid, da, ETH_ALEN);
IEEE80211_STYPE_ACTION);
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
-@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
- memcpy(mgmt->da, da, ETH_ALEN);
+@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
if (sdata->vif.type == NL80211_IFTYPE_AP ||
-- sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+- sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
++ sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
+ sdata->vif.type == NL80211_IFTYPE_WDS)
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
- */
- if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -484,6 +485,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_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC)
return -EINVAL;
- if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
- char buf[100];
- struct sta_info *sta = file->private_data;
- u32 staflags = get_sta_flags(sta);
-- int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
-+ int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
- staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
- staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
- staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
-@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
- staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
- staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
- staflags & WLAN_STA_WME ? "WME\n" : "",
-- staflags & WLAN_STA_WDS ? "WDS\n" : "",
- staflags & WLAN_STA_MFP ? "MFP\n" : "");
- return simple_read_from_buffer(userbuf, count, ppos, buf, res);
- }
+@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+ test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
+
+ int res = scnprintf(buf, sizeof(buf),
+- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
+ TEST(PS_DRIVER), TEST(AUTHORIZED),
+ TEST(SHORT_PREAMBLE),
+- TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
++ TEST(WME), TEST(CLEAR_PS_FILT),
+ TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
+ TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
+ TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
+@@ -163,7 +163,8 @@ static int ieee80211_check_queues(struct
+ return -EINVAL;
+ }
+
+- if (sdata->vif.type != NL80211_IFTYPE_AP) {
++ if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
++ !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
+ sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
+ return 0;
+ }
+@@ -281,7 +282,6 @@ static int ieee80211_do_open(struct net_
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_local *local = sdata->local;
u32 changed = 0;
int res;
u32 hw_reconf_flags = 0;
-@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+@@ -427,28 +427,6 @@ static int ieee80211_do_open(struct net_
set_bit(SDATA_STATE_RUNNING, &sdata->state);
- goto err_del_interface;
- }
-
-- /* no locking required since STA is not live yet */
-- sta->flags |= WLAN_STA_AUTHORIZED;
+- sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+- sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+- sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
-
- res = sta_info_insert(sta);
- if (res) {
/*
* set_multicast_list will be invoked by the networking core
* which will check whether any increments here were done in
-@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
- netif_tx_start_all_queues(dev);
-
- return 0;
-- err_del_interface:
-- drv_remove_interface(local, &sdata->vif);
-+
- err_stop:
- if (!local->open_count)
- drv_stop(local);
-@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+@@ -845,6 +823,70 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
+ skb->len - baselen, &elems);
+
-+ rates = ieee80211_sta_get_rates(local, &elems, band);
++ rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
+
+ rcu_read_lock();
+
+ sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
+
+ if (elems.ht_cap_elem)
-+ ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
+ elems.ht_cap_elem, &sta->sta.ht_cap);
+
+ if (elems.wmm_param)
-+ set_sta_flags(sta, WLAN_STA_WME);
++ set_sta_flag(sta, WLAN_STA_WME);
+
+ if (new) {
-+ sta->flags = WLAN_STA_AUTHORIZED;
++ set_sta_flag(sta, WLAN_STA_AUTHORIZED);
+ rate_control_rate_init(sta);
+ sta_info_insert_rcu(sta);
+ }
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct
+@@ -949,6 +991,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
break;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -2147,7 +2147,8 @@ ieee80211_rx_h_action(struct ieee80211_r
- */
- if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -103,7 +103,7 @@ static void
+ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
+ struct sk_buff *skb,
+ struct ieee80211_rate *rate,
+- int rtap_len)
++ int rtap_len, bool has_fcs)
+ {
+ struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+ struct ieee80211_radiotap_header *rthdr;
+@@ -134,7 +134,7 @@ ieee80211_add_rx_radiotap_header(struct
+ }
+
+ /* IEEE80211_RADIOTAP_FLAGS */
+- if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
++ if (has_fcs && (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS))
+ *pos |= IEEE80211_RADIOTAP_F_FCS;
+ if (status->flag & (RX_FLAG_FAILED_FCS_CRC | RX_FLAG_FAILED_PLCP_CRC))
+ *pos |= IEEE80211_RADIOTAP_F_BADFCS;
+@@ -294,7 +294,8 @@ ieee80211_rx_monitor(struct ieee80211_lo
+ }
+
+ /* prepend radiotap information */
+- ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom);
++ ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom,
++ true);
+
+ skb_reset_mac_header(skb);
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -2282,6 +2283,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_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC)
break;
- /* verify action_code is present */
-@@ -2345,13 +2346,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2496,14 +2498,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
return RX_DROP_MONITOR;
switch (stype) {
+ case cpu_to_le16(IEEE80211_STYPE_AUTH):
case cpu_to_le16(IEEE80211_STYPE_BEACON):
case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
- /* process for all: mesh, mlme, ibss */
+ /* process for all: mesh, mlme, ibss, wds */
break;
- case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
- case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-@@ -2692,10 +2694,16 @@ static int prepare_for_handlers(struct i
+ case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+ case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+@@ -2567,7 +2570,8 @@ static void ieee80211_rx_cooked_monitor(
+ goto out_free_skb;
+
+ /* prepend radiotap information */
+- ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom);
++ ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom,
++ false);
+
+ skb_set_mac_header(skb, 0);
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -2836,10 +2840,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
/* should never get here */
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
+ * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
* frames.
- * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
* @WLAN_STA_WME: Station is a QoS-STA.
- * @WLAN_STA_WDS: Station is one of our WDS peers.
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
* frame to this station is transmitted.
-@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
- WLAN_STA_SHORT_PREAMBLE = 1<<4,
- WLAN_STA_ASSOC_AP = 1<<5,
- WLAN_STA_WME = 1<<6,
-- WLAN_STA_WDS = 1<<7,
- WLAN_STA_CLEAR_PS_FILT = 1<<9,
- WLAN_STA_MFP = 1<<10,
- WLAN_STA_BLOCK_BA = 1<<11,
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -551,7 +551,8 @@ static void ath_tx_complete_aggr(struct
- if (clear_filter)
- tid->ac->clear_ps_filter = true;
- list_splice(&bf_pending, &tid->buf_q);
-- ath_tx_queue_tid(txq, tid);
-+ if (!an->sleeping)
-+ ath_tx_queue_tid(txq, tid);
- spin_unlock_bh(&txq->axq_lock);
- }
-
-@@ -643,8 +644,10 @@ static u32 ath_lookup_rate(struct ath_so
- * meet the minimum required mpdudensity.
- */
- static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
-- struct ath_buf *bf, u16 frmlen)
-+ struct ath_buf *bf, u16 frmlen,
-+ 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;
-@@ -667,6 +670,13 @@ static int ath_compute_num_delims(struct
- ndelim += ATH_AGGR_ENCRYPTDELIM;
-
- /*
-+ * Add delimiter when using RTS/CTS with aggregation
-+ * and non enterprise AR9003 card
-+ */
-+ if (first_subfrm)
-+ ndelim = max(ndelim, FIRST_DESC_NDELIMS);
-+
-+ /*
- * Convert desired mpdu density from microeconds to bytes based
- * on highest rate in rate series (i.e. first rate) to determine
- * required minimum length for subframe. Take into account
-@@ -755,7 +765,6 @@ static enum ATH_AGGR_STATUS ath_tx_form_
- status = ATH_AGGR_LIMITED;
- break;
- }
-- nframes++;
-
- /* add padding for previous frame to aggregation length */
- al += bpad + al_delta;
-@@ -764,9 +773,11 @@ static enum ATH_AGGR_STATUS ath_tx_form_
- * Get the delimiters needed to meet the MPDU
- * density for this node.
- */
-- ndelim = ath_compute_num_delims(sc, tid, bf_first, fi->framelen);
-+ ndelim = ath_compute_num_delims(sc, tid, bf_first, fi->framelen,
-+ !nframes);
- bpad = PADBYTES(al_delta) + (ndelim << 2);
-
-+ nframes++;
- bf->bf_next = NULL;
- ath9k_hw_set_desc_link(sc->sc_ah, bf->bf_desc, 0);
-
-@@ -1413,7 +1424,8 @@ static void ath_tx_send_ampdu(struct ath
- */
- TX_STAT_INC(txctl->txq->axq_qnum, a_queued_sw);
- list_add_tail(&bf->list, &tid->buf_q);
-- ath_tx_queue_tid(txctl->txq, tid);
-+ if (!txctl->an || !txctl->an->sleeping)
-+ ath_tx_queue_tid(txctl->txq, tid);
- return;
- }
-
-@@ -1572,9 +1584,9 @@ u8 ath_txchainmask_reduction(struct ath_
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath9k_channel *curchan = ah->curchan;
-- if ((sc->sc_flags & SC_OP_ENABLE_APM) &&
-- (curchan->channelFlags & CHANNEL_5GHZ) &&
-- (chainmask == 0x7) && (rate < 0x90))
-+ if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) &&
-+ (curchan->channelFlags & CHANNEL_5GHZ) &&
-+ (chainmask == 0x7) && (rate < 0x90))
- return 0x3;
- else
- return chainmask;
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -421,6 +421,7 @@ struct station_parameters {
- * @STATION_INFO_RX_BITRATE: @rxrate fields are filled
- * @STATION_INFO_BSS_PARAM: @bss_param filled
- * @STATION_INFO_CONNECTED_TIME: @connected_time filled
-+ * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
- */
- enum station_info_flags {
- STATION_INFO_INACTIVE_TIME = 1<<0,
-@@ -439,7 +440,8 @@ enum station_info_flags {
- STATION_INFO_SIGNAL_AVG = 1<<13,
- STATION_INFO_RX_BITRATE = 1<<14,
- STATION_INFO_BSS_PARAM = 1<<15,
-- STATION_INFO_CONNECTED_TIME = 1<<16
-+ STATION_INFO_CONNECTED_TIME = 1<<16,
-+ STATION_INFO_ASSOC_REQ_IES = 1<<17
- };
-
- /**
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -2236,7 +2236,7 @@ static int nl80211_send_station(struct s
- }
- nla_nest_end(msg, sinfoattr);
-
-- if (sinfo->assoc_req_ies)
-+ if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)
- NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
- sinfo->assoc_req_ies);
-
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -415,36 +415,12 @@ static void ar9003_hw_set11n_ratescenari
- static void ar9003_hw_set11n_aggr_first(struct ath_hw *ah, void *ds,
- u32 aggrLen)
- {
--#define FIRST_DESC_NDELIMS 60
- struct ar9003_txc *ads = (struct ar9003_txc *) ds;
-
- ads->ctl12 |= (AR_IsAggr | AR_MoreAggr);
-
-- if (ah->ent_mode & AR_ENT_OTP_MPSD) {
-- u32 ctl17, ndelim;
-- /*
-- * Add delimiter when using RTS/CTS with aggregation
-- * and non enterprise AR9003 card
-- */
-- ctl17 = ads->ctl17;
-- ndelim = MS(ctl17, AR_PadDelim);
--
-- if (ndelim < FIRST_DESC_NDELIMS) {
-- aggrLen += (FIRST_DESC_NDELIMS - ndelim) * 4;
-- ndelim = FIRST_DESC_NDELIMS;
-- }
--
-- ctl17 &= ~AR_AggrLen;
-- ctl17 |= SM(aggrLen, AR_AggrLen);
--
-- ctl17 &= ~AR_PadDelim;
-- ctl17 |= SM(ndelim, AR_PadDelim);
--
-- ads->ctl17 = ctl17;
-- } else {
-- ads->ctl17 &= ~AR_AggrLen;
-- ads->ctl17 |= SM(aggrLen, AR_AggrLen);
-- }
-+ ads->ctl17 &= ~AR_AggrLen;
-+ ads->ctl17 |= SM(aggrLen, AR_AggrLen);
- }
-
- static void ar9003_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds,
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -565,7 +565,6 @@ set_timer:
- static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
- {
- struct ath_node *an;
-- struct ath_hw *ah = sc->sc_ah;
- an = (struct ath_node *)sta->drv_priv;
-
- #ifdef CONFIG_ATH9K_DEBUGFS
-@@ -574,9 +573,6 @@ static void ath_node_attach(struct ath_s
- spin_unlock(&sc->nodes_lock);
- an->sta = sta;
- #endif
-- if ((ah->caps.hw_caps) & ATH9K_HW_CAP_APM)
-- sc->sc_flags |= SC_OP_ENABLE_APM;
--
- if (sc->sc_flags & SC_OP_TXAGGR) {
- ath_tx_node_init(sc, an);
- an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
-@@ -826,11 +822,9 @@ irqreturn_t ath_isr(int irq, void *dev)
- if (status & ATH9K_INT_TXURN)
- ath9k_hw_updatetxtriglevel(ah, true);
-
-- if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
-- if (status & ATH9K_INT_RXEOL) {
-- ah->imask &= ~(ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
-- ath9k_hw_set_interrupts(ah, ah->imask);
-- }
-+ if (status & ATH9K_INT_RXEOL) {
-+ ah->imask &= ~(ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
-+ ath9k_hw_set_interrupts(ah, ah->imask);
- }
-
- if (status & ATH9K_INT_MIB) {
-@@ -1680,6 +1674,7 @@ static int ath9k_config(struct ieee80211
-
- if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
- struct ieee80211_channel *curchan = hw->conf.channel;
-+ struct ath9k_channel old_chan;
- int pos = curchan->hw_value;
- int old_pos = -1;
- unsigned long flags;
-@@ -1696,15 +1691,25 @@ static int ath9k_config(struct ieee80211
- "Set channel: %d MHz type: %d\n",
- curchan->center_freq, conf->channel_type);
-
-- ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
-- curchan, conf->channel_type);
--
- /* update survey stats for the old channel before switching */
- spin_lock_irqsave(&common->cc_lock, flags);
- ath_update_survey_stats(sc);
- spin_unlock_irqrestore(&common->cc_lock, flags);
-
- /*
-+ * Preserve the current channel values, before updating
-+ * the same channel
-+ */
-+ if (old_pos == pos) {
-+ memcpy(&old_chan, &sc->sc_ah->channels[pos],
-+ sizeof(struct ath9k_channel));
-+ ah->curchan = &old_chan;
-+ }
-+
-+ ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
-+ curchan, conf->channel_type);
-+
-+ /*
- * If the operating channel changes, change the survey in-use flags
- * along with it.
- * Reset the survey data for the new channel, unless we're switching
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -761,7 +761,7 @@ static struct ath_buf *ath_get_next_rx_b
- * on. All this is necessary because of our use of
- * a self-linked list to avoid rx overruns.
- */
-- ret = ath9k_hw_rxprocdesc(ah, ds, rs, 0);
-+ ret = ath9k_hw_rxprocdesc(ah, ds, rs);
- if (ret == -EINPROGRESS) {
- struct ath_rx_status trs;
- struct ath_buf *tbf;
-@@ -787,7 +787,7 @@ static struct ath_buf *ath_get_next_rx_b
- */
-
- tds = tbf->bf_desc;
-- ret = ath9k_hw_rxprocdesc(ah, tds, &trs, 0);
-+ ret = ath9k_hw_rxprocdesc(ah, tds, &trs);
- if (ret == -EINPROGRESS)
- return NULL;
- }
-@@ -1978,5 +1978,10 @@ requeue:
-
- 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, ah->imask);
-+ }
-+
- return 0;
- }
---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -345,21 +345,8 @@ int ath9k_hw_setuptxqueue(struct ath_hw
- }
- memset(qi, 0, sizeof(struct ath9k_tx_queue_info));
- qi->tqi_type = type;
-- if (qinfo == NULL) {
-- qi->tqi_qflags =
-- TXQ_FLAG_TXOKINT_ENABLE
-- | TXQ_FLAG_TXERRINT_ENABLE
-- | TXQ_FLAG_TXDESCINT_ENABLE | TXQ_FLAG_TXURNINT_ENABLE;
-- qi->tqi_aifs = INIT_AIFS;
-- qi->tqi_cwmin = ATH9K_TXQ_USEDEFAULT;
-- qi->tqi_cwmax = INIT_CWMAX;
-- qi->tqi_shretry = INIT_SH_RETRY;
-- qi->tqi_lgretry = INIT_LG_RETRY;
-- qi->tqi_physCompBuf = 0;
-- } else {
-- qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
-- (void) ath9k_hw_set_txq_props(ah, q, qinfo);
-- }
-+ qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
-+ (void) ath9k_hw_set_txq_props(ah, q, qinfo);
-
- return q;
- }
-@@ -564,7 +551,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw
- EXPORT_SYMBOL(ath9k_hw_resettxqueue);
-
- int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
-- struct ath_rx_status *rs, u64 tsf)
-+ struct ath_rx_status *rs)
- {
- struct ar5416_desc ads;
- struct ar5416_desc *adsp = AR5416DESC(ds);
---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -687,7 +687,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw
- bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q);
- bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q);
- int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
-- struct ath_rx_status *rs, u64 tsf);
-+ struct ath_rx_status *rs);
- void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
- u32 size, u32 flags);
- bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -839,20 +839,8 @@ static bool ar9003_hw_init_cal(struct at
- struct ath9k_channel *chan)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ath9k_hw_capabilities *pCap = &ah->caps;
-- int val;
- bool txiqcal_done = false;
-
-- val = REG_READ(ah, AR_ENT_OTP);
-- ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
--
-- /* Configure rx/tx chains before running AGC/TxiQ cals */
-- if (val & AR_ENT_OTP_CHAIN2_DISABLE)
-- ar9003_hw_set_chain_masks(ah, 0x3, 0x3);
-- else
-- ar9003_hw_set_chain_masks(ah, pCap->rx_chainmask,
-- pCap->tx_chainmask);
--
- /* Do Tx IQ Calibration */
- REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
- AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
-@@ -887,9 +875,6 @@ static bool ar9003_hw_init_cal(struct at
- if (txiqcal_done)
- ar9003_hw_tx_iq_cal_post_proc(ah);
-
-- /* Revert chainmasks to their original values before NF cal */
-- ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
--
- ath9k_hw_start_nfcal(ah, true);
-
- /* Initialize list pointers */
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -540,7 +540,7 @@ static void ar9003_hw_init_bb(struct ath
- udelay(synthDelay + BASE_ACTIVATE_DELAY);
- }
-
--void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
-+static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
- {
- switch (rx) {
- case 0x5:
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -1124,6 +1124,4 @@
- #define AR_PHY_CL_TAB_CL_GAIN_MOD 0x1f
- #define AR_PHY_CL_TAB_CL_GAIN_MOD_S 0
-
--void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
--
- #endif /* AR9003_PHY_H */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -558,8 +558,7 @@ struct ath_ant_comb {
- #define SC_OP_BT_PRIORITY_DETECTED BIT(12)
- #define SC_OP_BT_SCAN BIT(13)
- #define SC_OP_ANI_RUN BIT(14)
--#define SC_OP_ENABLE_APM BIT(15)
--#define SC_OP_PRIM_STA_VIF BIT(16)
-+#define SC_OP_PRIM_STA_VIF BIT(15)
-
- /* Powersave flags */
- #define PS_WAIT_FOR_BEACON BIT(0)
-@@ -664,7 +663,6 @@ extern int led_blink;
- extern bool is_ath9k_unloaded;
-
- irqreturn_t ath_isr(int irq, void *dev);
--void ath9k_init_crypto(struct ath_softc *sc);
- int ath9k_init_device(u16 devid, struct ath_softc *sc,
- const struct ath_bus_ops *bus_ops);
- void ath9k_deinit_device(struct ath_softc *sc);
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -169,6 +169,32 @@ void ath9k_cmn_update_txpow(struct ath_h
- }
- EXPORT_SYMBOL(ath9k_cmn_update_txpow);
-
-+void ath9k_cmn_init_crypto(struct ath_hw *ah)
-+{
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ int i = 0;
-+
-+ /* Get the hardware key cache size. */
-+ common->keymax = AR_KEYTABLE_SIZE;
-+
-+ /*
-+ * Check whether the separate key cache entries
-+ * are required to handle both tx+rx MIC keys.
-+ * With split mic keys the number of stations is limited
-+ * to 27 otherwise 59.
-+ */
-+ if (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
-+ common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
-+
-+ /*
-+ * Reset the key cache since some parts do not
-+ * reset the contents on initial power up.
-+ */
-+ for (i = 0; i < common->keymax; i++)
-+ ath_hw_keyreset(common, (u16) i);
-+}
-+EXPORT_SYMBOL(ath9k_cmn_init_crypto);
-+
- static int __init ath9k_cmn_init(void)
- {
- return 0;
---- a/drivers/net/wireless/ath/ath9k/common.h
-+++ b/drivers/net/wireless/ath/ath9k/common.h
-@@ -62,3 +62,4 @@ void ath9k_cmn_btcoex_bt_stomp(struct at
- enum ath_stomp_type stomp_type);
- void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,
- u16 new_txpow, u16 *txpower);
-+void ath9k_cmn_init_crypto(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-@@ -572,25 +572,6 @@ err:
- return -EINVAL;
- }
-
--static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
--{
-- struct ath_common *common = ath9k_hw_common(priv->ah);
-- int i = 0;
--
-- /* Get the hardware key cache size. */
-- common->keymax = AR_KEYTABLE_SIZE;
--
-- if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
-- common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
--
-- /*
-- * Reset the key cache since some parts do not
-- * reset the contents on initial power up.
-- */
-- for (i = 0; i < common->keymax; i++)
-- ath_hw_keyreset(common, (u16) i);
--}
--
- static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)
- {
- if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) {
-@@ -720,7 +701,7 @@ static int ath9k_init_priv(struct ath9k_
- for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++)
- priv->cur_beacon_conf.bslot[i] = NULL;
-
-- ath9k_init_crypto(priv);
-+ ath9k_cmn_init_crypto(ah);
- ath9k_init_channels_rates(priv);
- ath9k_init_misc(priv);
-
+@@ -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/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -404,31 +404,6 @@ fail:
- return error;
+@@ -647,6 +647,24 @@ void ath9k_reload_chainmask_settings(str
+ setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
}
--void ath9k_init_crypto(struct ath_softc *sc)
--{
-- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- int i = 0;
--
-- /* Get the hardware key cache size. */
-- common->keymax = AR_KEYTABLE_SIZE;
--
-- /*
-- * Reset the key cache since some parts do not
-- * reset the contents on initial power up.
-- */
-- for (i = 0; i < common->keymax; i++)
-- ath_hw_keyreset(common, (u16) i);
--
-- /*
-- * Check whether the separate key cache entries
-- * are required to handle both tx+rx MIC keys.
-- * With split mic keys the number of stations is limited
-- * to 27 otherwise 59.
-- */
-- if (sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
-- common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
--}
--
- static int ath9k_init_btcoex(struct ath_softc *sc)
- {
- struct ath_txq *txq;
-@@ -630,7 +605,7 @@ static int ath9k_init_softc(u16 devid, s
- if (ret)
- goto err_btcoex;
-
-- ath9k_init_crypto(sc);
-+ ath9k_cmn_init_crypto(sc->sc_ah);
- ath9k_init_misc(sc);
-
- return 0;
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -129,7 +129,7 @@ static void ath_pci_aspm_init(struct ath
- return;
-
- parent = pdev->bus->self;
-- if (WARN_ON(!parent))
-+ if (!parent)
- return;
-
- pos = pci_pcie_cap(parent);
-@@ -338,7 +338,7 @@ static int ath_pci_resume(struct device
- * semi-random values after suspend/resume.
- */
- ath9k_ps_wakeup(sc);
-- ath9k_init_crypto(sc);
-+ ath9k_cmn_init_crypto(sc->sc_ah);
- ath9k_ps_restore(sc);
-
- sc->ps_idle = true;
---- a/drivers/net/wireless/ath/ath9k/calib.c
-+++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -82,7 +82,6 @@ static void ath9k_hw_update_nfcal_hist_b
- int16_t *nfarray)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ieee80211_conf *conf = &common->hw->conf;
- struct ath_nf_limits *limit;
- struct ath9k_nfcal_hist *h;
- bool high_nf_mid = false;
-@@ -94,7 +93,7 @@ static void ath9k_hw_update_nfcal_hist_b
-
- for (i = 0; i < NUM_NF_READINGS; i++) {
- if (!(chainmask & (1 << i)) ||
-- ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
-+ ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(ah->curchan)))
- continue;
-
- h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1163,6 +1163,59 @@ static const struct file_operations fops
- .llseek = default_llseek,/* read accesses f_pos */
- };
-
-+static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct ath_softc *sc = file->private_data;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath9k_nfcal_hist *h = sc->caldata.nfCalHist;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ieee80211_conf *conf = &common->hw->conf;
-+ u32 len = 0, size = 1500;
-+ u32 i, j;
-+ ssize_t retval = 0;
-+ char *buf;
-+ u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
-+ u8 nread;
-+
-+ buf = kzalloc(size, GFP_KERNEL);
-+ if (!buf)
-+ return -ENOMEM;
-+
-+ len += snprintf(buf + len, size - len,
-+ "Channel Noise Floor : %d\n", ah->noise);
-+ len += snprintf(buf + len, size - len,
-+ "Chain | privNF | # Readings | NF Readings\n");
-+ for (i = 0; i < NUM_NF_READINGS; i++) {
-+ if (!(chainmask & (1 << i)) ||
-+ ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
-+ continue;
-+
-+ nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
-+ len += snprintf(buf + len, size - len, " %d\t %d\t %d\t\t",
-+ i, h[i].privNF, nread);
-+ for (j = 0; j < nread; j++)
-+ len += snprintf(buf + len, size - len,
-+ " %d", h[i].nfCalBuffer[j]);
-+ len += snprintf(buf + len, size - len, "\n");
-+ }
-+
-+ if (len > size)
-+ len = size;
-+
-+ retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+ kfree(buf);
-+
-+ return retval;
-+}
-+
-+static const struct file_operations fops_dump_nfcal = {
-+ .read = read_file_dump_nfcal,
-+ .open = ath9k_debugfs_open,
-+ .owner = THIS_MODULE,
-+ .llseek = default_llseek,
++static const struct ieee80211_iface_limit if_limits[] = {
++ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) |
++ BIT(NL80211_IFTYPE_P2P_CLIENT) |
++ BIT(NL80211_IFTYPE_WDS) },
++ { .max = 8, .types =
++#ifdef CONFIG_MAC80211_MESH
++ BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
++ BIT(NL80211_IFTYPE_AP) |
++ BIT(NL80211_IFTYPE_P2P_GO) },
+};
+
- static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
- size_t count, loff_t *ppos)
++static const struct ieee80211_iface_combination if_comb = {
++ .limits = if_limits,
++ .n_limits = ARRAY_SIZE(if_limits),
++ .max_interfaces = 2048,
++ .num_different_channels = 1,
++};
+
+ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
{
-@@ -1262,6 +1315,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- &ah->config.cwm_ignore_extcca);
- debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_regdump);
-+ debugfs_create_file("dump_nfcal", S_IRUSR, sc->debug.debugfs_phy, sc,
-+ &fops_dump_nfcal);
- debugfs_create_file("base_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_base_eeprom);
- debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -69,7 +69,7 @@ static int ar9003_hw_power_interpolate(i
- static const struct ar9300_eeprom ar9300_default = {
- .eepromVersion = 2,
- .templateVersion = 2,
-- .macAddr = {1, 2, 3, 4, 5, 6},
-+ .macAddr = {0, 2, 3, 4, 5, 6},
- .custData = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
- .baseEepHeader = {
---- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-@@ -349,10 +349,7 @@ static u32 ath9k_hw_4k_get_eeprom(struct
- case EEP_ANT_DIV_CTL1:
- return pModal->antdiv_ctl1;
- case EEP_TXGAIN_TYPE:
-- if (ver_minor >= AR5416_EEP_MINOR_VER_19)
-- return pBase->txGainType;
-- else
-- return AR5416_EEP_TXGAIN_ORIGINAL;
-+ return pBase->txGainType;
- default:
- return 0;
- }
+@@ -676,6 +694,9 @@ void ath9k_set_hw_capab(struct ath_softc
+ BIT(NL80211_IFTYPE_ADHOC) |
+ BIT(NL80211_IFTYPE_MESH_POINT);
+
++ hw->wiphy->iface_combinations = &if_comb;
++ hw->wiphy->n_iface_combinations = 1;
++
+ if (AR_SREV_5416(sc->sc_ah))
+ hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -455,8 +455,8 @@ static void ieee80211_rx_bss_info(struct
+ * fall back to HT20 if we don't use or use
+ * the other extension channel
+ */
+- if ((channel_type == NL80211_CHAN_HT40MINUS ||
+- channel_type == NL80211_CHAN_HT40PLUS) &&
++ if (!(channel_type == NL80211_CHAN_HT40MINUS ||
++ channel_type == NL80211_CHAN_HT40PLUS) ||
+ channel_type != sdata->u.ibss.channel_type)
+ sta_ht_cap_new.cap &=
+ ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
projects / openwrt.git / blobdiff