---- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -622,7 +622,7 @@ ath5k_conf_tx(struct ieee80211_hw *hw, s
- qi.tqi_aifs = params->aifs;
- qi.tqi_cw_min = params->cw_min;
- qi.tqi_cw_max = params->cw_max;
-- qi.tqi_burst_time = params->txop;
-+ qi.tqi_burst_time = params->txop * 32;
-
- ATH5K_DBG(ah, ATH5K_DEBUG_ANY,
- "Configure tx [queue %d], "
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -26,106 +26,74 @@
- static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
- {
- if (AR_SREV_9271(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271,
-- ARRAY_SIZE(ar9271Modes_9271), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271,
-- ARRAY_SIZE(ar9271Common_9271), 2);
-- INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg,
-- ARRAY_SIZE(ar9271Modes_9271_ANI_reg), 5);
-+ 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;
- }
-
- if (ah->config.pcie_clock_req)
- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9280PciePhy_clkreq_off_L1_9280,
-- ARRAY_SIZE(ar9280PciePhy_clkreq_off_L1_9280), 2);
-+ ar9280PciePhy_clkreq_off_L1_9280);
- else
- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9280PciePhy_clkreq_always_on_L1_9280,
-- ARRAY_SIZE(ar9280PciePhy_clkreq_always_on_L1_9280), 2);
-+ ar9280PciePhy_clkreq_always_on_L1_9280);
- #ifdef CONFIG_PM_SLEEP
- INIT_INI_ARRAY(&ah->iniPcieSerdesWow,
-- ar9280PciePhy_awow,
-- ARRAY_SIZE(ar9280PciePhy_awow), 2);
-+ ar9280PciePhy_awow);
- #endif
-
- if (AR_SREV_9287_11_OR_LATER(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_1,
-- ARRAY_SIZE(ar9287Modes_9287_1_1), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_1,
-- ARRAY_SIZE(ar9287Common_9287_1_1), 2);
-+ INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_1);
-+ INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_1);
- } else if (AR_SREV_9285_12_OR_LATER(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2,
-- ARRAY_SIZE(ar9285Modes_9285_1_2), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2,
-- ARRAY_SIZE(ar9285Common_9285_1_2), 2);
-+ INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2);
-+ INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2);
- } else if (AR_SREV_9280_20_OR_LATER(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2,
-- ARRAY_SIZE(ar9280Modes_9280_2), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280_2,
-- ARRAY_SIZE(ar9280Common_9280_2), 2);
-+ INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2);
-+ INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280_2);
-
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar9280Modes_fast_clock_9280_2,
-- ARRAY_SIZE(ar9280Modes_fast_clock_9280_2), 3);
-+ ar9280Modes_fast_clock_9280_2);
- } else if (AR_SREV_9160_10_OR_LATER(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9160,
-- ARRAY_SIZE(ar5416Modes_9160), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9160,
-- ARRAY_SIZE(ar5416Common_9160), 2);
-+ INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9160);
-+ INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9160);
- if (AR_SREV_9160_11(ah)) {
- INIT_INI_ARRAY(&ah->iniAddac,
-- ar5416Addac_9160_1_1,
-- ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
-+ ar5416Addac_9160_1_1);
- } else {
-- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
-- ARRAY_SIZE(ar5416Addac_9160), 2);
-+ INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160);
- }
- } else if (AR_SREV_9100_OR_LATER(ah)) {
-- INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100,
-- ARRAY_SIZE(ar5416Modes_9100), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100,
-- ARRAY_SIZE(ar5416Common_9100), 2);
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100,
-- ARRAY_SIZE(ar5416Bank6_9100), 3);
-- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100,
-- ARRAY_SIZE(ar5416Addac_9100), 2);
-+ 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,
-- ARRAY_SIZE(ar5416Modes), 5);
-- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common,
-- ARRAY_SIZE(ar5416Common), 2);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC,
-- ARRAY_SIZE(ar5416Bank6TPC), 3);
-- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
-- ARRAY_SIZE(ar5416Addac), 2);
-+ 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 (!AR_SREV_9280_20_OR_LATER(ah)) {
- /* Common for AR5416, AR913x, AR9160 */
-- INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain,
-- ARRAY_SIZE(ar5416BB_RfGain), 3);
-+ INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain);
-
-- INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0,
-- ARRAY_SIZE(ar5416Bank0), 2);
-- INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1,
-- ARRAY_SIZE(ar5416Bank1), 2);
-- INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2,
-- ARRAY_SIZE(ar5416Bank2), 2);
-- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3,
-- ARRAY_SIZE(ar5416Bank3), 3);
-- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7,
-- ARRAY_SIZE(ar5416Bank7), 2);
-+ 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,
-- ARRAY_SIZE(ar5416Bank6), 3);
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
-
- /* Common for AR913x, AR9160 */
- if (!AR_SREV_5416(ah))
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9100,
-- ARRAY_SIZE(ar5416Bank6TPC_9100), 3);
-+ INIT_INI_ARRAY(&ah->iniBank6TPC,
-+ ar5416Bank6TPC_9100);
- }
-
- /* iniAddac needs to be modified for these chips */
-@@ -148,13 +116,9 @@ static void ar9002_hw_init_mode_regs(str
- }
- if (AR_SREV_9287_11_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniCckfirNormal,
-- ar9287Common_normal_cck_fir_coeff_9287_1_1,
-- ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
-- 2);
-+ ar9287Common_normal_cck_fir_coeff_9287_1_1);
- INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
-- ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
-- ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
-- 2);
-+ ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
- }
- }
-
-@@ -168,20 +132,16 @@ static void ar9280_20_hw_init_rxgain_ini
-
- if (rxgain_type == AR5416_EEP_RXGAIN_13DB_BACKOFF)
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9280Modes_backoff_13db_rxgain_9280_2,
-- ARRAY_SIZE(ar9280Modes_backoff_13db_rxgain_9280_2), 5);
-+ ar9280Modes_backoff_13db_rxgain_9280_2);
- else if (rxgain_type == AR5416_EEP_RXGAIN_23DB_BACKOFF)
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9280Modes_backoff_23db_rxgain_9280_2,
-- ARRAY_SIZE(ar9280Modes_backoff_23db_rxgain_9280_2), 5);
-+ ar9280Modes_backoff_23db_rxgain_9280_2);
- else
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9280Modes_original_rxgain_9280_2,
-- ARRAY_SIZE(ar9280Modes_original_rxgain_9280_2), 5);
-+ ar9280Modes_original_rxgain_9280_2);
- } else {
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9280Modes_original_rxgain_9280_2,
-- ARRAY_SIZE(ar9280Modes_original_rxgain_9280_2), 5);
-+ ar9280Modes_original_rxgain_9280_2);
- }
- }
-
-@@ -191,16 +151,13 @@ static void ar9280_20_hw_init_txgain_ini
- AR5416_EEP_MINOR_VER_19) {
- if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER)
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9280Modes_high_power_tx_gain_9280_2,
-- ARRAY_SIZE(ar9280Modes_high_power_tx_gain_9280_2), 5);
-+ ar9280Modes_high_power_tx_gain_9280_2);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9280Modes_original_tx_gain_9280_2,
-- ARRAY_SIZE(ar9280Modes_original_tx_gain_9280_2), 5);
-+ ar9280Modes_original_tx_gain_9280_2);
- } else {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9280Modes_original_tx_gain_9280_2,
-- ARRAY_SIZE(ar9280Modes_original_tx_gain_9280_2), 5);
-+ ar9280Modes_original_tx_gain_9280_2);
- }
- }
-
-@@ -208,12 +165,10 @@ static void ar9271_hw_init_txgain_ini(st
- {
- if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER)
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9271Modes_high_power_tx_gain_9271,
-- ARRAY_SIZE(ar9271Modes_high_power_tx_gain_9271), 5);
-+ ar9271Modes_high_power_tx_gain_9271);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9271Modes_normal_power_tx_gain_9271,
-- ARRAY_SIZE(ar9271Modes_normal_power_tx_gain_9271), 5);
-+ ar9271Modes_normal_power_tx_gain_9271);
- }
-
- static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah)
-@@ -222,8 +177,7 @@ static void ar9002_hw_init_mode_gain_reg
-
- if (AR_SREV_9287_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9287Modes_rx_gain_9287_1_1,
-- ARRAY_SIZE(ar9287Modes_rx_gain_9287_1_1), 5);
-+ ar9287Modes_rx_gain_9287_1_1);
- else if (AR_SREV_9280_20(ah))
- ar9280_20_hw_init_rxgain_ini(ah);
-
-@@ -231,8 +185,7 @@ static void ar9002_hw_init_mode_gain_reg
- ar9271_hw_init_txgain_ini(ah, txgain_type);
- } else if (AR_SREV_9287_11_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9287Modes_tx_gain_9287_1_1,
-- ARRAY_SIZE(ar9287Modes_tx_gain_9287_1_1), 5);
-+ ar9287Modes_tx_gain_9287_1_1);
- } else if (AR_SREV_9280_20(ah)) {
- ar9280_20_hw_init_txgain_ini(ah, txgain_type);
- } else if (AR_SREV_9285_12_OR_LATER(ah)) {
-@@ -240,26 +193,18 @@ static void ar9002_hw_init_mode_gain_reg
- if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER) {
- if (AR_SREV_9285E_20(ah)) {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9285Modes_XE2_0_high_power,
-- ARRAY_SIZE(
-- ar9285Modes_XE2_0_high_power), 5);
-+ ar9285Modes_XE2_0_high_power);
- } else {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9285Modes_high_power_tx_gain_9285_1_2,
-- ARRAY_SIZE(
-- ar9285Modes_high_power_tx_gain_9285_1_2), 5);
-+ ar9285Modes_high_power_tx_gain_9285_1_2);
- }
- } else {
- if (AR_SREV_9285E_20(ah)) {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9285Modes_XE2_0_normal_power,
-- ARRAY_SIZE(
-- ar9285Modes_XE2_0_normal_power), 5);
-+ ar9285Modes_XE2_0_normal_power);
- } else {
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9285Modes_original_tx_gain_9285_1_2,
-- ARRAY_SIZE(
-- ar9285Modes_original_tx_gain_9285_1_2), 5);
-+ ar9285Modes_original_tx_gain_9285_1_2);
- }
- }
- }
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -131,8 +131,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0cf0e0e0),
- .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext1 = {
-@@ -331,8 +332,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0c80c080),
- .papdRateMaskHt40 = LE32(0x0080c080),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext2 = {
-@@ -704,8 +706,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0c80c080),
- .papdRateMaskHt40 = LE32(0x0080c080),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext1 = {
-@@ -904,8 +907,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0cf0e0e0),
- .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext2 = {
-@@ -1278,8 +1282,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0c80c080),
- .papdRateMaskHt40 = LE32(0x0080c080),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext1 = {
-@@ -1478,8 +1483,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0cf0e0e0),
- .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext2 = {
-@@ -1852,8 +1858,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0c80c080),
- .papdRateMaskHt40 = LE32(0x0080c080),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext1 = {
-@@ -2052,8 +2059,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0cf0e0e0),
- .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext2 = {
-@@ -2425,8 +2433,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0c80C080),
- .papdRateMaskHt40 = LE32(0x0080C080),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext1 = {
-@@ -2625,8 +2634,9 @@ static const struct ar9300_eeprom ar9300
- .thresh62 = 28,
- .papdRateMaskHt20 = LE32(0x0cf0e0e0),
- .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+ .xlna_bias_strength = 0,
- .futureModal = {
-- 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0,
- },
- },
- .base_ext2 = {
-@@ -2971,14 +2981,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
- return (pBase->txrxMask >> 4) & 0xf;
- case EEP_RX_MASK:
- return pBase->txrxMask & 0xf;
-- case EEP_DRIVE_STRENGTH:
--#define AR9300_EEP_BASE_DRIV_STRENGTH 0x1
-- return pBase->miscConfiguration & AR9300_EEP_BASE_DRIV_STRENGTH;
-- case EEP_INTERNAL_REGULATOR:
-- /* Bit 4 is internal regulator flag */
-- return (pBase->featureEnable & 0x10) >> 4;
-- case EEP_SWREG:
-- return le32_to_cpu(pBase->swreg);
- case EEP_PAPRD:
- return !!(pBase->featureEnable & BIT(5));
- case EEP_CHAIN_MASK_REDUCE:
-@@ -2989,8 +2991,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
- return eep->modalHeader5G.antennaGain;
- case EEP_ANTENNA_GAIN_2G:
- return eep->modalHeader2G.antennaGain;
-- case EEP_QUICK_DROP:
-- return pBase->miscConfiguration & BIT(1);
- default:
- return 0;
- }
-@@ -3260,10 +3260,20 @@ static int ar9300_eeprom_restore_interna
- int it;
- u16 checksum, mchecksum;
- struct ath_common *common = ath9k_hw_common(ah);
-+ struct ar9300_eeprom *eep;
- eeprom_read_op read;
-
-- if (ath9k_hw_use_flash(ah))
-- return ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
-+ if (ath9k_hw_use_flash(ah)) {
-+ u8 txrx;
-+
-+ ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
-+
-+ /* check if eeprom contains valid data */
-+ eep = (struct ar9300_eeprom *) mptr;
-+ txrx = eep->baseEepHeader.txrxMask;
-+ if (txrx != 0 && txrx != 0xff)
-+ return 0;
-+ }
-
- word = kzalloc(2048, GFP_KERNEL);
- if (!word)
-@@ -3493,19 +3503,20 @@ static int ath9k_hw_ar9300_get_eeprom_re
- return 0;
- }
-
--static s32 ar9003_hw_xpa_bias_level_get(struct ath_hw *ah, bool is2ghz)
-+static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
-+ bool is2ghz)
- {
- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-
- if (is2ghz)
-- return eep->modalHeader2G.xpaBiasLvl;
-+ return &eep->modalHeader2G;
- else
-- return eep->modalHeader5G.xpaBiasLvl;
-+ return &eep->modalHeader5G;
- }
-
- static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
- {
-- int bias = ar9003_hw_xpa_bias_level_get(ah, is2ghz);
-+ int bias = ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
-
- if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
- REG_RMW_FIELD(ah, AR_CH0_TOP2, AR_CH0_TOP2_XPABIASLVL, bias);
-@@ -3521,57 +3532,26 @@ static void ar9003_hw_xpa_bias_level_app
- }
- }
-
--static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is_2ghz)
-+static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- __le16 val;
--
-- if (is_2ghz)
-- val = eep->modalHeader2G.switchcomspdt;
-- else
-- val = eep->modalHeader5G.switchcomspdt;
-- return le16_to_cpu(val);
-+ return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
- }
-
-
- static u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- __le32 val;
--
-- if (is2ghz)
-- val = eep->modalHeader2G.antCtrlCommon;
-- else
-- val = eep->modalHeader5G.antCtrlCommon;
-- return le32_to_cpu(val);
-+ return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
- }
-
- static u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- __le32 val;
--
-- if (is2ghz)
-- val = eep->modalHeader2G.antCtrlCommon2;
-- else
-- val = eep->modalHeader5G.antCtrlCommon2;
-- return le32_to_cpu(val);
-+ return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
- }
-
--static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah,
-- int chain,
-+static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
- bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- __le16 val = 0;
--
-- if (chain >= 0 && chain < AR9300_MAX_CHAINS) {
-- if (is2ghz)
-- val = eep->modalHeader2G.antCtrlChain[chain];
-- else
-- val = eep->modalHeader5G.antCtrlChain[chain];
-- }
--
-+ __le16 val = ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
- return le16_to_cpu(val);
- }
-
-@@ -3681,11 +3661,12 @@ static void ar9003_hw_ant_ctrl_apply(str
-
- static void ar9003_hw_drive_strength_apply(struct ath_hw *ah)
- {
-+ struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+ struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
- int drive_strength;
- unsigned long reg;
-
-- drive_strength = ath9k_hw_ar9300_get_eeprom(ah, EEP_DRIVE_STRENGTH);
--
-+ drive_strength = pBase->miscConfiguration & BIT(0);
- if (!drive_strength)
- return;
-
-@@ -3815,11 +3796,11 @@ static bool is_pmu_set(struct ath_hw *ah
-
- void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
- {
-- int internal_regulator =
-- ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);
-+ struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+ struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
- u32 reg_val;
-
-- if (internal_regulator) {
-+ if (pBase->featureEnable & BIT(4)) {
- if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {
- int reg_pmu_set;
-
-@@ -3863,11 +3844,11 @@ void ar9003_hw_internal_regulator_apply(
- if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))
- return;
- } else if (AR_SREV_9462(ah)) {
-- reg_val = ath9k_hw_ar9300_get_eeprom(ah, EEP_SWREG);
-+ reg_val = le32_to_cpu(pBase->swreg);
- REG_WRITE(ah, AR_PHY_PMU1, reg_val);
- } else {
- /* Internal regulator is ON. Write swreg register. */
-- reg_val = ath9k_hw_ar9300_get_eeprom(ah, EEP_SWREG);
-+ reg_val = le32_to_cpu(pBase->swreg);
- REG_WRITE(ah, AR_RTC_REG_CONTROL1,
- REG_READ(ah, AR_RTC_REG_CONTROL1) &
- (~AR_RTC_REG_CONTROL1_SWREG_PROGRAM));
-@@ -3909,6 +3890,9 @@ static void ar9003_hw_apply_tuning_caps(
- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
- u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0];
-
-+ if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
-+ return;
-+
- if (eep->baseEepHeader.featureEnable & 0x40) {
- tuning_caps_param &= 0x7f;
- REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPINDAC,
-@@ -3921,10 +3905,11 @@ static void ar9003_hw_apply_tuning_caps(
- static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)
- {
- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-- int quick_drop = ath9k_hw_ar9300_get_eeprom(ah, EEP_QUICK_DROP);
-+ struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
-+ int quick_drop;
- s32 t[3], f[3] = {5180, 5500, 5785};
-
-- if (!quick_drop)
-+ if (!(pBase->miscConfiguration & BIT(1)))
- return;
-
- if (freq < 4000)
-@@ -3938,13 +3923,11 @@ static void ar9003_hw_quick_drop_apply(s
- REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);
- }
-
--static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, u16 freq)
-+static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
- u32 value;
-
-- value = (freq < 4000) ? eep->modalHeader2G.txEndToXpaOff :
-- eep->modalHeader5G.txEndToXpaOff;
-+ value = ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
-
- REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
- AR_PHY_XPA_TIMING_CTL_TX_END_XPAB_OFF, value);
-@@ -3952,19 +3935,63 @@ static void ar9003_hw_txend_to_xpa_off_a
- AR_PHY_XPA_TIMING_CTL_TX_END_XPAA_OFF, value);
- }
-
-+static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
-+{
-+ struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+ u8 xpa_ctl;
-+
-+ if (!(eep->baseEepHeader.featureEnable & 0x80))
-+ return;
-+
-+ if (!AR_SREV_9300(ah) && !AR_SREV_9340(ah) && !AR_SREV_9580(ah))
-+ return;
-+
-+ xpa_ctl = ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
-+ if (is2ghz)
-+ REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
-+ AR_PHY_XPA_TIMING_CTL_FRAME_XPAB_ON, xpa_ctl);
-+ else
-+ REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
-+ AR_PHY_XPA_TIMING_CTL_FRAME_XPAA_ON, xpa_ctl);
-+}
-+
-+static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)
-+{
-+ struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+ u8 bias;
-+
-+ if (!(eep->baseEepHeader.featureEnable & 0x40))
-+ return;
-+
-+ if (!AR_SREV_9300(ah))
-+ return;
-+
-+ bias = ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
-+ REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+ bias & 0x3);
-+ bias >>= 2;
-+ REG_RMW_FIELD(ah, AR_PHY_65NM_CH1_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+ bias & 0x3);
-+ bias >>= 2;
-+ REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+ bias & 0x3);
-+}
-+
- static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
- struct ath9k_channel *chan)
- {
-- ar9003_hw_xpa_bias_level_apply(ah, IS_CHAN_2GHZ(chan));
-- ar9003_hw_ant_ctrl_apply(ah, IS_CHAN_2GHZ(chan));
-+ bool is2ghz = IS_CHAN_2GHZ(chan);
-+ ar9003_hw_xpa_timing_control_apply(ah, is2ghz);
-+ ar9003_hw_xpa_bias_level_apply(ah, is2ghz);
-+ ar9003_hw_ant_ctrl_apply(ah, is2ghz);
- ar9003_hw_drive_strength_apply(ah);
-+ ar9003_hw_xlna_bias_strength_apply(ah, is2ghz);
- ar9003_hw_atten_apply(ah, chan);
- ar9003_hw_quick_drop_apply(ah, chan->channel);
- if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah))
- ar9003_hw_internal_regulator_apply(ah);
-- if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
-- ar9003_hw_apply_tuning_caps(ah);
-- ar9003_hw_txend_to_xpa_off_apply(ah, chan->channel);
-+ ar9003_hw_apply_tuning_caps(ah);
-+ ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz);
- }
-
- static void ath9k_hw_ar9300_set_addac(struct ath_hw *ah,
-@@ -5100,14 +5127,9 @@ s32 ar9003_hw_get_rx_gain_idx(struct ath
- return (eep->baseEepHeader.txrxgain) & 0xf; /* bits 3:0 */
- }
-
--u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz)
-+u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is2ghz)
- {
-- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--
-- if (is_2ghz)
-- return eep->modalHeader2G.spurChans;
-- else
-- return eep->modalHeader5G.spurChans;
-+ return ar9003_modal_header(ah, is2ghz)->spurChans;
- }
-
- unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-@@ -231,7 +231,8 @@ struct ar9300_modal_eep_header {
- __le32 papdRateMaskHt20;
- __le32 papdRateMaskHt40;
- __le16 switchcomspdt;
-- u8 futureModal[8];
-+ u8 xlna_bias_strength;
-+ u8 futureModal[7];
- } __packed;
-
- struct ar9300_cal_data_per_freq_op_loop {
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -44,462 +44,310 @@ static void ar9003_hw_init_mode_regs(str
- ar9462_2p0_baseband_core_txfir_coeff_japan_2484
- if (AR_SREV_9330_11(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9331_1p1_mac_core,
-- ARRAY_SIZE(ar9331_1p1_mac_core), 2);
-+ ar9331_1p1_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9331_1p1_mac_postamble,
-- ARRAY_SIZE(ar9331_1p1_mac_postamble), 5);
-+ ar9331_1p1_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9331_1p1_baseband_core,
-- ARRAY_SIZE(ar9331_1p1_baseband_core), 2);
-+ ar9331_1p1_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9331_1p1_baseband_postamble,
-- ARRAY_SIZE(ar9331_1p1_baseband_postamble), 5);
-+ ar9331_1p1_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9331_1p1_radio_core,
-- ARRAY_SIZE(ar9331_1p1_radio_core), 2);
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST], NULL, 0, 0);
-+ ar9331_1p1_radio_core);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9331_1p1_soc_preamble,
-- ARRAY_SIZE(ar9331_1p1_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9331_1p1_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9331_1p1_soc_postamble,
-- ARRAY_SIZE(ar9331_1p1_soc_postamble), 2);
-+ ar9331_1p1_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_rx_gain_1p1,
-- ARRAY_SIZE(ar9331_common_rx_gain_1p1), 2);
-+ ar9331_common_rx_gain_1p1);
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_lowest_ob_db_tx_gain_1p1,
-- ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p1),
-- 5);
-+ ar9331_modes_lowest_ob_db_tx_gain_1p1);
-
- /* additional clock settings */
- if (ah->is_clk_25mhz)
- INIT_INI_ARRAY(&ah->iniAdditional,
-- ar9331_1p1_xtal_25M,
-- ARRAY_SIZE(ar9331_1p1_xtal_25M), 2);
-+ ar9331_1p1_xtal_25M);
- else
- INIT_INI_ARRAY(&ah->iniAdditional,
-- ar9331_1p1_xtal_40M,
-- ARRAY_SIZE(ar9331_1p1_xtal_40M), 2);
-+ ar9331_1p1_xtal_40M);
- } else if (AR_SREV_9330_12(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9331_1p2_mac_core,
-- ARRAY_SIZE(ar9331_1p2_mac_core), 2);
-+ ar9331_1p2_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9331_1p2_mac_postamble,
-- ARRAY_SIZE(ar9331_1p2_mac_postamble), 5);
-+ ar9331_1p2_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9331_1p2_baseband_core,
-- ARRAY_SIZE(ar9331_1p2_baseband_core), 2);
-+ ar9331_1p2_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9331_1p2_baseband_postamble,
-- ARRAY_SIZE(ar9331_1p2_baseband_postamble), 5);
-+ ar9331_1p2_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9331_1p2_radio_core,
-- ARRAY_SIZE(ar9331_1p2_radio_core), 2);
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST], NULL, 0, 0);
-+ ar9331_1p2_radio_core);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9331_1p2_soc_preamble,
-- ARRAY_SIZE(ar9331_1p2_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9331_1p2_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9331_1p2_soc_postamble,
-- ARRAY_SIZE(ar9331_1p2_soc_postamble), 2);
-+ ar9331_1p2_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_rx_gain_1p2,
-- ARRAY_SIZE(ar9331_common_rx_gain_1p2), 2);
-+ ar9331_common_rx_gain_1p2);
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_lowest_ob_db_tx_gain_1p2,
-- ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p2),
-- 5);
-+ ar9331_modes_lowest_ob_db_tx_gain_1p2);
-
- /* additional clock settings */
- if (ah->is_clk_25mhz)
- INIT_INI_ARRAY(&ah->iniAdditional,
-- ar9331_1p2_xtal_25M,
-- ARRAY_SIZE(ar9331_1p2_xtal_25M), 2);
-+ ar9331_1p2_xtal_25M);
- else
- INIT_INI_ARRAY(&ah->iniAdditional,
-- ar9331_1p2_xtal_40M,
-- ARRAY_SIZE(ar9331_1p2_xtal_40M), 2);
-+ ar9331_1p2_xtal_40M);
- } else if (AR_SREV_9340(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9340_1p0_mac_core,
-- ARRAY_SIZE(ar9340_1p0_mac_core), 2);
-+ ar9340_1p0_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9340_1p0_mac_postamble,
-- ARRAY_SIZE(ar9340_1p0_mac_postamble), 5);
-+ ar9340_1p0_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9340_1p0_baseband_core,
-- ARRAY_SIZE(ar9340_1p0_baseband_core), 2);
-+ ar9340_1p0_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9340_1p0_baseband_postamble,
-- ARRAY_SIZE(ar9340_1p0_baseband_postamble), 5);
-+ ar9340_1p0_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9340_1p0_radio_core,
-- ARRAY_SIZE(ar9340_1p0_radio_core), 2);
-+ ar9340_1p0_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar9340_1p0_radio_postamble,
-- ARRAY_SIZE(ar9340_1p0_radio_postamble), 5);
-+ ar9340_1p0_radio_postamble);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9340_1p0_soc_preamble,
-- ARRAY_SIZE(ar9340_1p0_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9340_1p0_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9340_1p0_soc_postamble,
-- ARRAY_SIZE(ar9340_1p0_soc_postamble), 5);
-+ ar9340_1p0_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9340Common_wo_xlna_rx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
-- 5);
-- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_high_ob_db_tx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Modes_high_ob_db_tx_gain_table_1p0),
-- 5);
-+ ar9340Common_wo_xlna_rx_gain_table_1p0);
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9340Modes_high_ob_db_tx_gain_table_1p0);
-
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar9340Modes_fast_clock_1p0,
-- ARRAY_SIZE(ar9340Modes_fast_clock_1p0),
-- 3);
-+ ar9340Modes_fast_clock_1p0);
-
- if (!ah->is_clk_25mhz)
- INIT_INI_ARRAY(&ah->iniAdditional,
-- ar9340_1p0_radio_core_40M,
-- ARRAY_SIZE(ar9340_1p0_radio_core_40M),
-- 2);
-+ ar9340_1p0_radio_core_40M);
- } else if (AR_SREV_9485_11(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9485_1_1_mac_core,
-- ARRAY_SIZE(ar9485_1_1_mac_core), 2);
-+ ar9485_1_1_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9485_1_1_mac_postamble,
-- ARRAY_SIZE(ar9485_1_1_mac_postamble), 5);
-+ ar9485_1_1_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1,
-- ARRAY_SIZE(ar9485_1_1), 2);
-+ INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9485_1_1_baseband_core,
-- ARRAY_SIZE(ar9485_1_1_baseband_core), 2);
-+ ar9485_1_1_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9485_1_1_baseband_postamble,
-- ARRAY_SIZE(ar9485_1_1_baseband_postamble), 5);
-+ ar9485_1_1_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9485_1_1_radio_core,
-- ARRAY_SIZE(ar9485_1_1_radio_core), 2);
-+ ar9485_1_1_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar9485_1_1_radio_postamble,
-- ARRAY_SIZE(ar9485_1_1_radio_postamble), 2);
-+ ar9485_1_1_radio_postamble);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9485_1_1_soc_preamble,
-- ARRAY_SIZE(ar9485_1_1_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST], NULL, 0, 0);
-+ ar9485_1_1_soc_preamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9485Common_wo_xlna_rx_gain_1_1,
-- ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1), 2);
-+ ar9485Common_wo_xlna_rx_gain_1_1);
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485_modes_lowest_ob_db_tx_gain_1_1,
-- ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
-- 5);
-+ ar9485_modes_lowest_ob_db_tx_gain_1_1);
-
- /* Load PCIE SERDES settings from INI */
-
- /* Awake Setting */
-
- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9485_1_1_pcie_phy_clkreq_disable_L1,
-- ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
-- 2);
-+ ar9485_1_1_pcie_phy_clkreq_disable_L1);
-
- /* Sleep Setting */
-
- INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-- ar9485_1_1_pcie_phy_clkreq_disable_L1,
-- ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
-- 2);
-+ ar9485_1_1_pcie_phy_clkreq_disable_L1);
- } else if (AR_SREV_9462_20(ah)) {
-
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core,
-- ARRAY_SIZE(ar9462_2p0_mac_core), 2);
-+ INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9462_2p0_mac_postamble,
-- ARRAY_SIZE(ar9462_2p0_mac_postamble), 5);
-+ ar9462_2p0_mac_postamble);
-
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9462_2p0_baseband_core,
-- ARRAY_SIZE(ar9462_2p0_baseband_core), 2);
-+ ar9462_2p0_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9462_2p0_baseband_postamble,
-- ARRAY_SIZE(ar9462_2p0_baseband_postamble), 5);
-+ ar9462_2p0_baseband_postamble);
-
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9462_2p0_radio_core,
-- ARRAY_SIZE(ar9462_2p0_radio_core), 2);
-+ ar9462_2p0_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar9462_2p0_radio_postamble,
-- ARRAY_SIZE(ar9462_2p0_radio_postamble), 5);
-+ ar9462_2p0_radio_postamble);
- INIT_INI_ARRAY(&ah->ini_radio_post_sys2ant,
-- ar9462_2p0_radio_postamble_sys2ant,
-- ARRAY_SIZE(ar9462_2p0_radio_postamble_sys2ant),
-- 5);
-+ ar9462_2p0_radio_postamble_sys2ant);
-
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9462_2p0_soc_preamble,
-- ARRAY_SIZE(ar9462_2p0_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9462_2p0_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9462_2p0_soc_postamble,
-- ARRAY_SIZE(ar9462_2p0_soc_postamble), 5);
-+ ar9462_2p0_soc_postamble);
-
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9462_common_rx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2);
-+ ar9462_common_rx_gain_table_2p0);
-
- /* Awake -> Sleep Setting */
- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- PCIE_PLL_ON_CREQ_DIS_L1_2P0,
-- ARRAY_SIZE(PCIE_PLL_ON_CREQ_DIS_L1_2P0),
-- 2);
-+ PCIE_PLL_ON_CREQ_DIS_L1_2P0);
- /* Sleep -> Awake Setting */
- INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-- PCIE_PLL_ON_CREQ_DIS_L1_2P0,
-- ARRAY_SIZE(PCIE_PLL_ON_CREQ_DIS_L1_2P0),
-- 2);
-+ PCIE_PLL_ON_CREQ_DIS_L1_2P0);
-
- /* Fast clock modal settings */
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar9462_modes_fast_clock_2p0,
-- ARRAY_SIZE(ar9462_modes_fast_clock_2p0), 3);
-+ ar9462_modes_fast_clock_2p0);
-
- INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
-- AR9462_BB_CTX_COEFJ(2p0),
-- ARRAY_SIZE(AR9462_BB_CTX_COEFJ(2p0)), 2);
-+ AR9462_BB_CTX_COEFJ(2p0));
-
-- INIT_INI_ARRAY(&ah->ini_japan2484, AR9462_BBC_TXIFR_COEFFJ,
-- ARRAY_SIZE(AR9462_BBC_TXIFR_COEFFJ), 2);
-+ INIT_INI_ARRAY(&ah->ini_japan2484, AR9462_BBC_TXIFR_COEFFJ);
- } else if (AR_SREV_9550(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar955x_1p0_mac_core,
-- ARRAY_SIZE(ar955x_1p0_mac_core), 2);
-+ ar955x_1p0_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar955x_1p0_mac_postamble,
-- ARRAY_SIZE(ar955x_1p0_mac_postamble), 5);
-+ ar955x_1p0_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar955x_1p0_baseband_core,
-- ARRAY_SIZE(ar955x_1p0_baseband_core), 2);
-+ ar955x_1p0_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar955x_1p0_baseband_postamble,
-- ARRAY_SIZE(ar955x_1p0_baseband_postamble), 5);
-+ ar955x_1p0_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar955x_1p0_radio_core,
-- ARRAY_SIZE(ar955x_1p0_radio_core), 2);
-+ ar955x_1p0_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar955x_1p0_radio_postamble,
-- ARRAY_SIZE(ar955x_1p0_radio_postamble), 5);
-+ ar955x_1p0_radio_postamble);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar955x_1p0_soc_preamble,
-- ARRAY_SIZE(ar955x_1p0_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar955x_1p0_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar955x_1p0_soc_postamble,
-- ARRAY_SIZE(ar955x_1p0_soc_postamble), 5);
-+ ar955x_1p0_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar955x_1p0_common_wo_xlna_rx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_table),
-- 2);
-+ ar955x_1p0_common_wo_xlna_rx_gain_table);
- INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
-- ar955x_1p0_common_wo_xlna_rx_gain_bounds,
-- ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_bounds),
-- 5);
-- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar955x_1p0_modes_xpa_tx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_modes_xpa_tx_gain_table),
-- 9);
-+ ar955x_1p0_common_wo_xlna_rx_gain_bounds);
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar955x_1p0_modes_xpa_tx_gain_table);
-
- /* Fast clock modal settings */
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar955x_1p0_modes_fast_clock,
-- ARRAY_SIZE(ar955x_1p0_modes_fast_clock), 3);
-+ ar955x_1p0_modes_fast_clock);
- } else if (AR_SREV_9580(ah)) {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9580_1p0_mac_core,
-- ARRAY_SIZE(ar9580_1p0_mac_core), 2);
-+ ar9580_1p0_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9580_1p0_mac_postamble,
-- ARRAY_SIZE(ar9580_1p0_mac_postamble), 5);
-+ ar9580_1p0_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9580_1p0_baseband_core,
-- ARRAY_SIZE(ar9580_1p0_baseband_core), 2);
-+ ar9580_1p0_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9580_1p0_baseband_postamble,
-- ARRAY_SIZE(ar9580_1p0_baseband_postamble), 5);
-+ ar9580_1p0_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9580_1p0_radio_core,
-- ARRAY_SIZE(ar9580_1p0_radio_core), 2);
-+ ar9580_1p0_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar9580_1p0_radio_postamble,
-- ARRAY_SIZE(ar9580_1p0_radio_postamble), 5);
-+ ar9580_1p0_radio_postamble);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9580_1p0_soc_preamble,
-- ARRAY_SIZE(ar9580_1p0_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9580_1p0_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9580_1p0_soc_postamble,
-- ARRAY_SIZE(ar9580_1p0_soc_postamble), 5);
-+ ar9580_1p0_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9580_1p0_rx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_rx_gain_table), 2);
-+ ar9580_1p0_rx_gain_table);
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9580_1p0_low_ob_db_tx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_low_ob_db_tx_gain_table),
-- 5);
-+ ar9580_1p0_low_ob_db_tx_gain_table);
-
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar9580_1p0_modes_fast_clock,
-- ARRAY_SIZE(ar9580_1p0_modes_fast_clock),
-- 3);
-+ ar9580_1p0_modes_fast_clock);
- } else {
- /* mac */
-- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-- ar9300_2p2_mac_core,
-- ARRAY_SIZE(ar9300_2p2_mac_core), 2);
-+ ar9300_2p2_mac_core);
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-- ar9300_2p2_mac_postamble,
-- ARRAY_SIZE(ar9300_2p2_mac_postamble), 5);
-+ ar9300_2p2_mac_postamble);
-
- /* bb */
-- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-- ar9300_2p2_baseband_core,
-- ARRAY_SIZE(ar9300_2p2_baseband_core), 2);
-+ ar9300_2p2_baseband_core);
- INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-- ar9300_2p2_baseband_postamble,
-- ARRAY_SIZE(ar9300_2p2_baseband_postamble), 5);
-+ ar9300_2p2_baseband_postamble);
-
- /* radio */
-- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-- ar9300_2p2_radio_core,
-- ARRAY_SIZE(ar9300_2p2_radio_core), 2);
-+ ar9300_2p2_radio_core);
- INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-- ar9300_2p2_radio_postamble,
-- ARRAY_SIZE(ar9300_2p2_radio_postamble), 5);
-+ ar9300_2p2_radio_postamble);
-
- /* soc */
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-- ar9300_2p2_soc_preamble,
-- ARRAY_SIZE(ar9300_2p2_soc_preamble), 2);
-- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+ ar9300_2p2_soc_preamble);
- INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-- ar9300_2p2_soc_postamble,
-- ARRAY_SIZE(ar9300_2p2_soc_postamble), 5);
-+ ar9300_2p2_soc_postamble);
-
- /* rx/tx gain */
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9300Common_rx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), 2);
-+ ar9300Common_rx_gain_table_2p2);
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
-- 5);
-+ ar9300Modes_lowest_ob_db_tx_gain_table_2p2);
-
- /* Load PCIE SERDES settings from INI */
-
- /* Awake Setting */
-
- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
-- ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
-- 2);
-+ ar9300PciePhy_pll_on_clkreq_disable_L1_2p2);
-
- /* Sleep Setting */
-
- INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-- ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
-- ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
-- 2);
-+ ar9300PciePhy_pll_on_clkreq_disable_L1_2p2);
-
- /* Fast clock modal settings */
- INIT_INI_ARRAY(&ah->iniModesFastClock,
-- ar9300Modes_fast_clock_2p2,
-- ARRAY_SIZE(ar9300Modes_fast_clock_2p2),
-- 3);
-+ ar9300Modes_fast_clock_2p2);
- }
- }
-
-@@ -507,156 +355,110 @@ static void ar9003_tx_gain_table_mode0(s
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_lowest_ob_db_tx_gain_1p2,
-- ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p2),
-- 5);
-+ ar9331_modes_lowest_ob_db_tx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_lowest_ob_db_tx_gain_1p1,
-- ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p1),
-- 5);
-+ ar9331_modes_lowest_ob_db_tx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
-- 5);
-+ ar9340Modes_lowest_ob_db_tx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485_modes_lowest_ob_db_tx_gain_1_1,
-- ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
-- 5);
-+ ar9485_modes_lowest_ob_db_tx_gain_1_1);
- else if (AR_SREV_9550(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar955x_1p0_modes_xpa_tx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_modes_xpa_tx_gain_table),
-- 9);
-+ ar955x_1p0_modes_xpa_tx_gain_table);
- else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9580_1p0_lowest_ob_db_tx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_lowest_ob_db_tx_gain_table),
-- 5);
-+ ar9580_1p0_lowest_ob_db_tx_gain_table);
- else if (AR_SREV_9462_20(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9462_modes_low_ob_db_tx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_modes_low_ob_db_tx_gain_table_2p0),
-- 5);
-+ ar9462_modes_low_ob_db_tx_gain_table_2p0);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
-- 5);
-+ ar9300Modes_lowest_ob_db_tx_gain_table_2p2);
- }
-
- static void ar9003_tx_gain_table_mode1(struct ath_hw *ah)
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_high_ob_db_tx_gain_1p2,
-- ARRAY_SIZE(ar9331_modes_high_ob_db_tx_gain_1p2),
-- 5);
-+ ar9331_modes_high_ob_db_tx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_high_ob_db_tx_gain_1p1,
-- ARRAY_SIZE(ar9331_modes_high_ob_db_tx_gain_1p1),
-- 5);
-+ ar9331_modes_high_ob_db_tx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
-- 5);
-+ ar9340Modes_high_ob_db_tx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485Modes_high_ob_db_tx_gain_1_1,
-- ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
-- 5);
-+ ar9485Modes_high_ob_db_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9580_1p0_high_ob_db_tx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_high_ob_db_tx_gain_table),
-- 5);
-+ ar9580_1p0_high_ob_db_tx_gain_table);
- else if (AR_SREV_9550(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar955x_1p0_modes_no_xpa_tx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_modes_no_xpa_tx_gain_table),
-- 9);
-+ ar955x_1p0_modes_no_xpa_tx_gain_table);
- else if (AR_SREV_9462_20(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9462_modes_high_ob_db_tx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_modes_high_ob_db_tx_gain_table_2p0),
-- 5);
-+ ar9462_modes_high_ob_db_tx_gain_table_2p0);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9300Modes_high_ob_db_tx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p2),
-- 5);
-+ ar9300Modes_high_ob_db_tx_gain_table_2p2);
- }
-
- static void ar9003_tx_gain_table_mode2(struct ath_hw *ah)
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_low_ob_db_tx_gain_1p2,
-- ARRAY_SIZE(ar9331_modes_low_ob_db_tx_gain_1p2),
-- 5);
-+ ar9331_modes_low_ob_db_tx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_low_ob_db_tx_gain_1p1,
-- ARRAY_SIZE(ar9331_modes_low_ob_db_tx_gain_1p1),
-- 5);
-+ ar9331_modes_low_ob_db_tx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
-- 5);
-+ ar9340Modes_low_ob_db_tx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485Modes_low_ob_db_tx_gain_1_1,
-- ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
-- 5);
-+ ar9485Modes_low_ob_db_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9580_1p0_low_ob_db_tx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_low_ob_db_tx_gain_table),
-- 5);
-+ ar9580_1p0_low_ob_db_tx_gain_table);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9300Modes_low_ob_db_tx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p2),
-- 5);
-+ ar9300Modes_low_ob_db_tx_gain_table_2p2);
- }
-
- static void ar9003_tx_gain_table_mode3(struct ath_hw *ah)
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_high_power_tx_gain_1p2,
-- ARRAY_SIZE(ar9331_modes_high_power_tx_gain_1p2),
-- 5);
-+ ar9331_modes_high_power_tx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9331_modes_high_power_tx_gain_1p1,
-- ARRAY_SIZE(ar9331_modes_high_power_tx_gain_1p1),
-- 5);
-+ ar9331_modes_high_power_tx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
-- 5);
-+ ar9340Modes_high_power_tx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485Modes_high_power_tx_gain_1_1,
-- ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
-- 5);
-+ ar9485Modes_high_power_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9580_1p0_high_power_tx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_high_power_tx_gain_table),
-- 5);
-+ ar9580_1p0_high_power_tx_gain_table);
- else
- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9300Modes_high_power_tx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Modes_high_power_tx_gain_table_2p2),
-- 5);
-+ ar9300Modes_high_power_tx_gain_table_2p2);
-+}
-+
-+static void ar9003_tx_gain_table_mode4(struct ath_hw *ah)
-+{
-+ if (AR_SREV_9340(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9340Modes_mixed_ob_db_tx_gain_table_1p0);
-+ else if (AR_SREV_9580(ah))
-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
-+ ar9580_1p0_mixed_ob_db_tx_gain_table);
- }
-
- static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
-@@ -675,6 +477,9 @@ static void ar9003_tx_gain_table_apply(s
- case 3:
- ar9003_tx_gain_table_mode3(ah);
- break;
-+ case 4:
-+ ar9003_tx_gain_table_mode4(ah);
-+ break;
- }
- }
-
-@@ -682,104 +487,67 @@ static void ar9003_rx_gain_table_mode0(s
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_rx_gain_1p2,
-- ARRAY_SIZE(ar9331_common_rx_gain_1p2),
-- 2);
-+ ar9331_common_rx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_rx_gain_1p1,
-- ARRAY_SIZE(ar9331_common_rx_gain_1p1),
-- 2);
-+ ar9331_common_rx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9340Common_rx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Common_rx_gain_table_1p0),
-- 2);
-+ ar9340Common_rx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9485Common_wo_xlna_rx_gain_1_1,
-- ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
-- 2);
-+ ar9485Common_wo_xlna_rx_gain_1_1);
- else if (AR_SREV_9550(ah)) {
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar955x_1p0_common_rx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_common_rx_gain_table),
-- 2);
-+ ar955x_1p0_common_rx_gain_table);
- INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
-- ar955x_1p0_common_rx_gain_bounds,
-- ARRAY_SIZE(ar955x_1p0_common_rx_gain_bounds),
-- 5);
-+ ar955x_1p0_common_rx_gain_bounds);
- } else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9580_1p0_rx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_rx_gain_table),
-- 2);
-+ ar9580_1p0_rx_gain_table);
- else if (AR_SREV_9462_20(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9462_common_rx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_common_rx_gain_table_2p0),
-- 2);
-+ ar9462_common_rx_gain_table_2p0);
- else
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9300Common_rx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Common_rx_gain_table_2p2),
-- 2);
-+ ar9300Common_rx_gain_table_2p2);
- }
-
- static void ar9003_rx_gain_table_mode1(struct ath_hw *ah)
- {
- if (AR_SREV_9330_12(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_wo_xlna_rx_gain_1p2,
-- ARRAY_SIZE(ar9331_common_wo_xlna_rx_gain_1p2),
-- 2);
-+ ar9331_common_wo_xlna_rx_gain_1p2);
- else if (AR_SREV_9330_11(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9331_common_wo_xlna_rx_gain_1p1,
-- ARRAY_SIZE(ar9331_common_wo_xlna_rx_gain_1p1),
-- 2);
-+ ar9331_common_wo_xlna_rx_gain_1p1);
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9340Common_wo_xlna_rx_gain_table_1p0,
-- ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
-- 2);
-+ ar9340Common_wo_xlna_rx_gain_table_1p0);
- else if (AR_SREV_9485_11(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9485Common_wo_xlna_rx_gain_1_1,
-- ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
-- 2);
-+ ar9485Common_wo_xlna_rx_gain_1_1);
- else if (AR_SREV_9462_20(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9462_common_wo_xlna_rx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_common_wo_xlna_rx_gain_table_2p0),
-- 2);
-+ ar9462_common_wo_xlna_rx_gain_table_2p0);
- else if (AR_SREV_9550(ah)) {
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar955x_1p0_common_wo_xlna_rx_gain_table,
-- ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_table),
-- 2);
-+ ar955x_1p0_common_wo_xlna_rx_gain_table);
- INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
-- ar955x_1p0_common_wo_xlna_rx_gain_bounds,
-- ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_bounds),
-- 5);
-+ ar955x_1p0_common_wo_xlna_rx_gain_bounds);
- } else if (AR_SREV_9580(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9580_1p0_wo_xlna_rx_gain_table,
-- ARRAY_SIZE(ar9580_1p0_wo_xlna_rx_gain_table),
-- 2);
-+ ar9580_1p0_wo_xlna_rx_gain_table);
- else
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9300Common_wo_xlna_rx_gain_table_2p2,
-- ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2),
-- 2);
-+ ar9300Common_wo_xlna_rx_gain_table_2p2);
- }
-
- static void ar9003_rx_gain_table_mode2(struct ath_hw *ah)
- {
- if (AR_SREV_9462_20(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
-- ar9462_common_mixed_rx_gain_table_2p0,
-- ARRAY_SIZE(ar9462_common_mixed_rx_gain_table_2p0), 2);
-+ ar9462_common_mixed_rx_gain_table_2p0);
- }
-
- static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -117,8 +117,8 @@ static int ar9003_hw_set_channel(struct
- ah->is_clk_25mhz) {
- u32 chan_frac;
-
-- channelSel = (freq * 2) / 75;
-- chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
-+ channelSel = freq / 75;
-+ chan_frac = ((freq % 75) * 0x20000) / 75;
- channelSel = (channelSel << 17) | chan_frac;
- } else {
- channelSel = CHANSEL_5G(freq);
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -633,6 +633,8 @@
- #define AR_PHY_65NM_CH0_BIAS2 0x160c4
- #define AR_PHY_65NM_CH0_BIAS4 0x160cc
- #define AR_PHY_65NM_CH0_RXTX4 0x1610c
-+#define AR_PHY_65NM_CH1_RXTX4 0x1650c
-+#define AR_PHY_65NM_CH2_RXTX4 0x1690c
-
- #define AR_CH0_TOP (AR_SREV_9300(ah) ? 0x16288 : \
- ((AR_SREV_9462(ah) ? 0x1628c : 0x16280)))
-@@ -876,6 +878,9 @@
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON 0x10000000
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S 28
-
-+#define AR_PHY_65NM_RXTX4_XLNA_BIAS 0xC0000000
-+#define AR_PHY_65NM_RXTX4_XLNA_BIAS_S 30
-+
- /*
- * Channel 1 Register Map
- */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -297,6 +297,8 @@ struct ath_tx {
- struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
- struct ath_descdma txdma;
- struct ath_txq *txq_map[WME_NUM_AC];
-+ u32 txq_max_pending[WME_NUM_AC];
-+ u16 max_aggr_framelen[WME_NUM_AC][4][32];
- };
-
- struct ath_rx_edma {
-@@ -341,6 +343,7 @@ int ath_tx_init(struct ath_softc *sc, in
- void ath_tx_cleanup(struct ath_softc *sc);
- int ath_txq_update(struct ath_softc *sc, int qnum,
- struct ath9k_tx_queue_info *q);
-+void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);
- int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
- struct ath_tx_control *txctl);
- void ath_tx_tasklet(struct ath_softc *sc);
-@@ -360,7 +363,7 @@ void ath_tx_aggr_sleep(struct ieee80211_
-
- struct ath_vif {
- int av_bslot;
-- bool is_bslot_active, primary_sta_vif;
-+ bool primary_sta_vif;
- __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
- struct ath_buf *av_bcbuf;
- };
-@@ -386,6 +389,7 @@ struct ath_beacon_config {
- u16 dtim_period;
- u16 bmiss_timeout;
- u8 dtim_count;
-+ bool enable_beacon;
- };
-
- struct ath_beacon {
-@@ -397,7 +401,6 @@ struct ath_beacon {
-
- u32 beaconq;
- u32 bmisscnt;
-- u32 ast_be_xmit;
- u32 bc_tstamp;
- struct ieee80211_vif *bslot[ATH_BCBUF];
- int slottime;
-@@ -411,12 +414,14 @@ struct ath_beacon {
- bool tx_last;
- };
-
--void ath_beacon_tasklet(unsigned long data);
--void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
--int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif);
--void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);
--int ath_beaconq_config(struct ath_softc *sc);
--void ath_set_beacon(struct ath_softc *sc);
-+void ath9k_beacon_tasklet(unsigned long data);
-+bool ath9k_allow_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+ u32 changed);
-+void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_set_beacon(struct ath_softc *sc);
- void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
-
- /*******************/
-@@ -442,9 +447,12 @@ void ath_rx_poll(unsigned long data);
- void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
- void ath_paprd_calibrate(struct work_struct *work);
- void ath_ani_calibrate(unsigned long data);
--void ath_start_ani(struct ath_common *common);
-+void ath_start_ani(struct ath_softc *sc);
-+void ath_stop_ani(struct ath_softc *sc);
-+void ath_check_ani(struct ath_softc *sc);
- int ath_update_survey_stats(struct ath_softc *sc);
- void ath_update_survey_nf(struct ath_softc *sc, int channel);
-+void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
-
- /**********/
- /* BTCOEX */
-@@ -619,7 +627,6 @@ enum sc_op_flags {
- SC_OP_INVALID,
- SC_OP_BEACONS,
- SC_OP_RXFLUSH,
-- SC_OP_TSF_RESET,
- 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
-@@ -30,7 +30,7 @@ static void ath9k_reset_beacon_status(st
- * the operating mode of the station (AP or AdHoc). Parameters are AIFS
- * settings and channel width min/max
- */
--int ath_beaconq_config(struct ath_softc *sc)
-+static void ath9k_beaconq_config(struct ath_softc *sc)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -38,6 +38,7 @@ int ath_beaconq_config(struct ath_softc
- struct ath_txq *txq;
-
- ath9k_hw_get_txq_props(ah, sc->beacon.beaconq, &qi);
-+
- if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
- /* Always burst out beacon and CAB traffic. */
- qi.tqi_aifs = 1;
-@@ -56,12 +57,9 @@ int ath_beaconq_config(struct ath_softc
- }
-
- if (!ath9k_hw_set_txq_props(ah, sc->beacon.beaconq, &qi)) {
-- ath_err(common,
-- "Unable to update h/w beacon queue parameters\n");
-- return 0;
-+ ath_err(common, "Unable to update h/w beacon queue parameters\n");
- } else {
- ath9k_hw_resettxqueue(ah, sc->beacon.beaconq);
-- return 1;
- }
- }
-
-@@ -70,7 +68,7 @@ int ath_beaconq_config(struct ath_softc
- * up rate codes, and channel flags. Beacons are always sent out at the
- * lowest rate, and are not retried.
- */
--static void ath_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
-+static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
- struct ath_buf *bf, int rateidx)
- {
- struct sk_buff *skb = bf->bf_mpdu;
-@@ -81,8 +79,6 @@ static void ath_beacon_setup(struct ath_
- u8 chainmask = ah->txchainmask;
- u8 rate = 0;
-
-- ath9k_reset_beacon_status(sc);
--
- sband = &sc->sbands[common->hw->conf.channel->band];
- rate = sband->bitrates[rateidx].hw_value;
- if (vif->bss_conf.use_short_preamble)
-@@ -111,7 +107,7 @@ static void ath_beacon_setup(struct ath_
- ath9k_hw_set_txdesc(ah, bf->bf_desc, &info);
- }
-
--static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
-+static void ath9k_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
- {
- struct ath_softc *sc = hw->priv;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-@@ -128,28 +124,22 @@ static void ath_tx_cabq(struct ieee80211
- }
- }
-
--static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
-- struct ieee80211_vif *vif)
-+static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
-+ struct ieee80211_vif *vif)
- {
- struct ath_softc *sc = hw->priv;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct ath_buf *bf;
-- struct ath_vif *avp;
-+ struct ath_vif *avp = (void *)vif->drv_priv;
- struct sk_buff *skb;
-- struct ath_txq *cabq;
-+ struct ath_txq *cabq = sc->beacon.cabq;
- struct ieee80211_tx_info *info;
-+ struct ieee80211_mgmt *mgmt_hdr;
- int cabq_depth;
-
-- ath9k_reset_beacon_status(sc);
--
-- avp = (void *)vif->drv_priv;
-- cabq = sc->beacon.cabq;
--
-- if ((avp->av_bcbuf == NULL) || !avp->is_bslot_active)
-+ if (avp->av_bcbuf == NULL)
- return NULL;
-
-- /* Release the old beacon first */
--
- bf = avp->av_bcbuf;
- skb = bf->bf_mpdu;
- if (skb) {
-@@ -159,14 +149,14 @@ static struct ath_buf *ath_beacon_genera
- bf->bf_buf_addr = 0;
- }
-
-- /* Get a new beacon from mac80211 */
--
- skb = ieee80211_beacon_get(hw, vif);
-- bf->bf_mpdu = skb;
- if (skb == NULL)
- return NULL;
-- ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp =
-- avp->tsf_adjust;
-+
-+ bf->bf_mpdu = skb;
-+
-+ mgmt_hdr = (struct ieee80211_mgmt *)skb->data;
-+ mgmt_hdr->u.beacon.timestamp = avp->tsf_adjust;
-
- info = IEEE80211_SKB_CB(skb);
- if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-@@ -212,61 +202,52 @@ static struct ath_buf *ath_beacon_genera
- }
- }
-
-- ath_beacon_setup(sc, vif, bf, info->control.rates[0].idx);
-+ ath9k_beacon_setup(sc, vif, bf, info->control.rates[0].idx);
-
- while (skb) {
-- ath_tx_cabq(hw, skb);
-+ ath9k_tx_cabq(hw, skb);
- skb = ieee80211_get_buffered_bc(hw, vif);
- }
-
- return bf;
- }
-
--int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
-+void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ath_vif *avp;
-- struct ath_buf *bf;
-- struct sk_buff *skb;
-- struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-- __le64 tstamp;
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ int slot;
-
-- avp = (void *)vif->drv_priv;
-+ avp->av_bcbuf = list_first_entry(&sc->beacon.bbuf, struct ath_buf, list);
-+ list_del(&avp->av_bcbuf->list);
-
-- /* Allocate a beacon descriptor if we haven't done so. */
-- if (!avp->av_bcbuf) {
-- /* Allocate beacon state for hostap/ibss. We know
-- * a buffer is available. */
-- avp->av_bcbuf = list_first_entry(&sc->beacon.bbuf,
-- struct ath_buf, list);
-- list_del(&avp->av_bcbuf->list);
--
-- if (ath9k_uses_beacons(vif->type)) {
-- int slot;
-- /*
-- * Assign the vif to a beacon xmit slot. As
-- * above, this cannot fail to find one.
-- */
-- avp->av_bslot = 0;
-- for (slot = 0; slot < ATH_BCBUF; slot++)
-- if (sc->beacon.bslot[slot] == NULL) {
-- avp->av_bslot = slot;
-- avp->is_bslot_active = false;
--
-- /* NB: keep looking for a double slot */
-- if (slot == 0 || !sc->beacon.bslot[slot-1])
-- break;
-- }
-- BUG_ON(sc->beacon.bslot[avp->av_bslot] != NULL);
-- sc->beacon.bslot[avp->av_bslot] = vif;
-- sc->nbcnvifs++;
-+ for (slot = 0; slot < ATH_BCBUF; slot++) {
-+ if (sc->beacon.bslot[slot] == NULL) {
-+ avp->av_bslot = slot;
-+ break;
- }
- }
-
-- /* release the previous beacon frame, if it already exists. */
-- bf = avp->av_bcbuf;
-- if (bf->bf_mpdu != NULL) {
-- skb = bf->bf_mpdu;
-+ sc->beacon.bslot[avp->av_bslot] = vif;
-+ sc->nbcnvifs++;
-+
-+ ath_dbg(common, CONFIG, "Added interface at beacon slot: %d\n",
-+ avp->av_bslot);
-+}
-+
-+void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
-+{
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ struct ath_buf *bf = avp->av_bcbuf;
-+
-+ ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
-+ avp->av_bslot);
-+
-+ tasklet_disable(&sc->bcon_tasklet);
-+
-+ if (bf && bf->bf_mpdu) {
-+ struct sk_buff *skb = bf->bf_mpdu;
- dma_unmap_single(sc->dev, bf->bf_buf_addr,
- skb->len, DMA_TO_DEVICE);
- dev_kfree_skb_any(skb);
-@@ -274,99 +255,74 @@ int ath_beacon_alloc(struct ath_softc *s
- bf->bf_buf_addr = 0;
- }
-
-- /* NB: the beacon data buffer must be 32-bit aligned. */
-- skb = ieee80211_beacon_get(sc->hw, vif);
-- if (skb == NULL)
-- return -ENOMEM;
--
-- tstamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
-- sc->beacon.bc_tstamp = (u32) le64_to_cpu(tstamp);
-- /* Calculate a TSF adjustment factor required for staggered beacons. */
-- if (avp->av_bslot > 0) {
-- u64 tsfadjust;
-- int intval;
-+ avp->av_bcbuf = NULL;
-+ sc->beacon.bslot[avp->av_bslot] = NULL;
-+ sc->nbcnvifs--;
-+ list_add_tail(&bf->list, &sc->beacon.bbuf);
-
-- intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
-+ tasklet_enable(&sc->bcon_tasklet);
-+}
-
-- /*
-- * Calculate the TSF offset for this beacon slot, i.e., the
-- * number of usecs that need to be added to the timestamp field
-- * in Beacon and Probe Response frames. Beacon slot 0 is
-- * processed at the correct offset, so it does not require TSF
-- * adjustment. Other slots are adjusted to get the timestamp
-- * close to the TBTT for the BSS.
-- */
-- tsfadjust = TU_TO_USEC(intval * avp->av_bslot) / ATH_BCBUF;
-- avp->tsf_adjust = cpu_to_le64(tsfadjust);
-+static int ath9k_beacon_choose_slot(struct ath_softc *sc)
-+{
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+ u16 intval;
-+ u32 tsftu;
-+ u64 tsf;
-+ int slot;
-
-- ath_dbg(common, BEACON,
-- "stagger beacons, bslot %d intval %u tsfadjust %llu\n",
-- avp->av_bslot, intval, (unsigned long long)tsfadjust);
-+ if (sc->sc_ah->opmode != NL80211_IFTYPE_AP) {
-+ ath_dbg(common, BEACON, "slot 0, tsf: %llu\n",
-+ ath9k_hw_gettsf64(sc->sc_ah));
-+ return 0;
-+ }
-
-- ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp =
-- avp->tsf_adjust;
-- } else
-- avp->tsf_adjust = cpu_to_le64(0);
-+ intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
-+ tsf = ath9k_hw_gettsf64(sc->sc_ah);
-+ tsf += TU_TO_USEC(sc->sc_ah->config.sw_beacon_response_time);
-+ tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
-+ slot = (tsftu % (intval * ATH_BCBUF)) / intval;
-
-- bf->bf_mpdu = skb;
-- bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
-- skb->len, DMA_TO_DEVICE);
-- if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {
-- dev_kfree_skb_any(skb);
-- bf->bf_mpdu = NULL;
-- bf->bf_buf_addr = 0;
-- ath_err(common, "dma_mapping_error on beacon alloc\n");
-- return -ENOMEM;
-- }
-- avp->is_bslot_active = true;
-+ ath_dbg(common, BEACON, "slot: %d tsf: %llu tsftu: %u\n",
-+ slot, tsf, tsftu / ATH_BCBUF);
-
-- return 0;
-+ return slot;
- }
-
--void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp)
-+void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
-- if (avp->av_bcbuf != NULL) {
-- struct ath_buf *bf;
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ u64 tsfadjust;
-
-- avp->is_bslot_active = false;
-- if (avp->av_bslot != -1) {
-- sc->beacon.bslot[avp->av_bslot] = NULL;
-- sc->nbcnvifs--;
-- avp->av_bslot = -1;
-- }
-+ if (avp->av_bslot == 0)
-+ return;
-
-- bf = avp->av_bcbuf;
-- if (bf->bf_mpdu != NULL) {
-- struct sk_buff *skb = bf->bf_mpdu;
-- dma_unmap_single(sc->dev, bf->bf_buf_addr,
-- skb->len, DMA_TO_DEVICE);
-- dev_kfree_skb_any(skb);
-- bf->bf_mpdu = NULL;
-- bf->bf_buf_addr = 0;
-- }
-- list_add_tail(&bf->list, &sc->beacon.bbuf);
-+ tsfadjust = cur_conf->beacon_interval * avp->av_bslot / ATH_BCBUF;
-+ avp->tsf_adjust = cpu_to_le64(TU_TO_USEC(tsfadjust));
-
-- avp->av_bcbuf = NULL;
-- }
-+ ath_dbg(common, CONFIG, "tsfadjust is: %llu for bslot: %d\n",
-+ (unsigned long long)tsfadjust, avp->av_bslot);
- }
-
--void ath_beacon_tasklet(unsigned long data)
-+void ath9k_beacon_tasklet(unsigned long data)
- {
- struct ath_softc *sc = (struct ath_softc *)data;
-- struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath_buf *bf = NULL;
- struct ieee80211_vif *vif;
- bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
- int slot;
-- u32 bfaddr, bc = 0;
-
-- if (work_pending(&sc->hw_reset_work)) {
-+ if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) {
- 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
-@@ -390,55 +346,25 @@ void ath_beacon_tasklet(unsigned long da
- } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
- ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
- sc->beacon.bmisscnt = 0;
-- set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, RESET_TYPE_BEACON_STUCK);
- }
-
- return;
- }
-
-- /*
-- * Generate beacon frames. we are sending frames
-- * staggered so calculate the slot for this frame based
-- * on the tsf to safeguard against missing an swba.
-- */
--
--
-- if (ah->opmode == NL80211_IFTYPE_AP) {
-- u16 intval;
-- u32 tsftu;
-- u64 tsf;
--
-- intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
-- tsf = ath9k_hw_gettsf64(ah);
-- tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
-- tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
-- slot = (tsftu % (intval * ATH_BCBUF)) / intval;
-- vif = sc->beacon.bslot[slot];
--
-- ath_dbg(common, BEACON,
-- "slot %d [tsf %llu tsftu %u intval %u] vif %p\n",
-- slot, tsf, tsftu / ATH_BCBUF, intval, vif);
-- } else {
-- slot = 0;
-- vif = sc->beacon.bslot[slot];
-- }
-+ slot = ath9k_beacon_choose_slot(sc);
-+ vif = sc->beacon.bslot[slot];
-
-+ if (!vif || !vif->bss_conf.enable_beacon)
-+ return;
-
-- bfaddr = 0;
-- if (vif) {
-- bf = ath_beacon_generate(sc->hw, vif);
-- if (bf != NULL) {
-- bfaddr = bf->bf_daddr;
-- bc = 1;
-- }
-+ 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",
-- sc->beacon.bmisscnt);
-- sc->beacon.bmisscnt = 0;
-- }
-+ if (sc->beacon.bmisscnt != 0) {
-+ ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
-+ sc->beacon.bmisscnt);
-+ sc->beacon.bmisscnt = 0;
- }
-
- /*
-@@ -458,39 +384,37 @@ void ath_beacon_tasklet(unsigned long da
- * set to ATH_BCBUF so this check is a noop.
- */
- if (sc->beacon.updateslot == UPDATE) {
-- sc->beacon.updateslot = COMMIT; /* commit next beacon */
-+ sc->beacon.updateslot = COMMIT;
- sc->beacon.slotupdate = slot;
-- } else if (sc->beacon.updateslot == COMMIT && sc->beacon.slotupdate == slot) {
-+ } else if (sc->beacon.updateslot == COMMIT &&
-+ sc->beacon.slotupdate == slot) {
- ah->slottime = sc->beacon.slottime;
- ath9k_hw_init_global_settings(ah);
- sc->beacon.updateslot = OK;
- }
-- if (bfaddr != 0) {
-+
-+ if (bf) {
-+ ath9k_reset_beacon_status(sc);
-+
- /* NB: cabq traffic should already be queued and primed */
-- ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bfaddr);
-+ ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bf->bf_daddr);
-
- if (!edma)
- ath9k_hw_txstart(ah, sc->beacon.beaconq);
--
-- sc->beacon.ast_be_xmit += bc; /* XXX per-vif? */
- }
- }
-
--static void ath9k_beacon_init(struct ath_softc *sc,
-- u32 next_beacon,
-- u32 beacon_period)
-+static void ath9k_beacon_init(struct ath_softc *sc, u32 nexttbtt, u32 intval)
- {
-- if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
-- ath9k_ps_wakeup(sc);
-- ath9k_hw_reset_tsf(sc->sc_ah);
-- }
--
-- ath9k_hw_beaconinit(sc->sc_ah, next_beacon, beacon_period);
-+ struct ath_hw *ah = sc->sc_ah;
-
-- if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
-- ath9k_ps_restore(sc);
-- clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-- }
-+ ath9k_hw_disable_interrupts(ah);
-+ ath9k_hw_reset_tsf(ah);
-+ ath9k_beaconq_config(sc);
-+ ath9k_hw_beaconinit(ah, nexttbtt, intval);
-+ sc->beacon.bmisscnt = 0;
-+ ath9k_hw_set_interrupts(ah);
-+ ath9k_hw_enable_interrupts(ah);
- }
-
- /*
-@@ -498,32 +422,27 @@ static void ath9k_beacon_init(struct ath
- * burst together. For the former arrange for the SWBA to be delivered for each
- * slot. Slots that are not occupied will generate nothing.
- */
--static void ath_beacon_config_ap(struct ath_softc *sc,
-- struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_ap(struct ath_softc *sc,
-+ struct ath_beacon_config *conf)
- {
- struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
- u32 nexttbtt, intval;
-
- /* NB: the beacon interval is kept internally in TU's */
- intval = TU_TO_USEC(conf->beacon_interval);
-- intval /= ATH_BCBUF; /* for staggered beacons */
-+ intval /= ATH_BCBUF;
- nexttbtt = intval;
-
-- /*
-- * In AP mode we enable the beacon timers and SWBA interrupts to
-- * prepare beacon frames.
-- */
-- ah->imask |= ATH9K_INT_SWBA;
-- ath_beaconq_config(sc);
-+ if (conf->enable_beacon)
-+ ah->imask |= ATH9K_INT_SWBA;
-+ else
-+ ah->imask &= ~ATH9K_INT_SWBA;
-
-- /* Set the computed AP beacon timers */
-+ ath_dbg(common, BEACON, "AP nexttbtt: %u intval: %u conf_intval: %u\n",
-+ nexttbtt, intval, conf->beacon_interval);
-
-- ath9k_hw_disable_interrupts(ah);
-- set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
- ath9k_beacon_init(sc, nexttbtt, intval);
-- sc->beacon.bmisscnt = 0;
-- ath9k_hw_set_interrupts(ah);
-- ath9k_hw_enable_interrupts(ah);
- }
-
- /*
-@@ -534,8 +453,8 @@ static void ath_beacon_config_ap(struct
- * we'll receive a BMISS interrupt when we stop seeing beacons from the AP
- * we've associated with.
- */
--static void ath_beacon_config_sta(struct ath_softc *sc,
-- struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_sta(struct ath_softc *sc,
-+ struct ath_beacon_config *conf)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -654,8 +573,8 @@ static void ath_beacon_config_sta(struct
- ath9k_hw_enable_interrupts(ah);
- }
-
--static void ath_beacon_config_adhoc(struct ath_softc *sc,
-- struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_adhoc(struct ath_softc *sc,
-+ struct ath_beacon_config *conf)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -669,82 +588,53 @@ static void ath_beacon_config_adhoc(stru
- tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);
- nexttbtt = tsf + intval;
-
-- ath_dbg(common, BEACON, "IBSS nexttbtt %u intval %u (%u)\n",
-- nexttbtt, intval, conf->beacon_interval);
--
-- /*
-- * In IBSS mode enable the beacon timers but only enable SWBA interrupts
-- * if we need to manually prepare beacon frames. Otherwise we use a
-- * self-linked tx descriptor and let the hardware deal with things.
-- */
-- ah->imask |= ATH9K_INT_SWBA;
--
-- ath_beaconq_config(sc);
-+ if (conf->enable_beacon)
-+ ah->imask |= ATH9K_INT_SWBA;
-+ else
-+ ah->imask &= ~ATH9K_INT_SWBA;
-
-- /* Set the computed ADHOC beacon timers */
-+ ath_dbg(common, BEACON, "IBSS nexttbtt: %u intval: %u conf_intval: %u\n",
-+ nexttbtt, intval, conf->beacon_interval);
-
-- ath9k_hw_disable_interrupts(ah);
- ath9k_beacon_init(sc, nexttbtt, intval);
-- sc->beacon.bmisscnt = 0;
--
-- ath9k_hw_set_interrupts(ah);
-- ath9k_hw_enable_interrupts(ah);
- }
-
--static bool ath9k_allow_beacon_config(struct ath_softc *sc,
-- struct ieee80211_vif *vif)
-+bool ath9k_allow_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
-- struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
- struct ath_vif *avp = (void *)vif->drv_priv;
-
-- /*
-- * Can not have different beacon interval on multiple
-- * AP interface case
-- */
-- if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
-- (sc->nbcnvifs > 1) &&
-- (vif->type == NL80211_IFTYPE_AP) &&
-- (cur_conf->beacon_interval != bss_conf->beacon_int)) {
-- ath_dbg(common, CONFIG,
-- "Changing beacon interval of multiple AP interfaces !\n");
-- return false;
-- }
-- /*
-- * Can not configure station vif's beacon config
-- * while on AP opmode
-- */
-- if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
-- (vif->type != NL80211_IFTYPE_AP)) {
-- ath_dbg(common, CONFIG,
-- "STA vif's beacon not allowed on AP mode\n");
-- return false;
-+ if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-+ if ((vif->type != NL80211_IFTYPE_AP) ||
-+ (sc->nbcnvifs > 1)) {
-+ ath_dbg(common, CONFIG,
-+ "An AP interface is already present !\n");
-+ return false;
-+ }
- }
-- /*
-- * Do not allow beacon config if HW was already configured
-- * with another STA vif
-- */
-- if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&
-- (vif->type == NL80211_IFTYPE_STATION) &&
-- test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
-- !avp->primary_sta_vif) {
-- ath_dbg(common, CONFIG,
-- "Beacon already configured for a station interface\n");
-- return false;
-+
-+ if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-+ if ((vif->type == NL80211_IFTYPE_STATION) &&
-+ test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
-+ !avp->primary_sta_vif) {
-+ ath_dbg(common, CONFIG,
-+ "Beacon already configured for a station interface\n");
-+ return false;
-+ }
- }
-+
- return true;
- }
-
--void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
-+static void ath9k_cache_beacon_config(struct ath_softc *sc,
-+ struct ieee80211_bss_conf *bss_conf)
- {
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-
-- if (!ath9k_allow_beacon_config(sc, vif))
-- return;
-+ ath_dbg(common, BEACON,
-+ "Caching beacon data for BSS: %pM\n", bss_conf->bssid);
-
-- /* Setup the beacon configuration parameters */
- cur_conf->beacon_interval = bss_conf->beacon_int;
- cur_conf->dtim_period = bss_conf->dtim_period;
- cur_conf->listen_interval = 1;
-@@ -769,73 +659,59 @@ void ath_beacon_config(struct ath_softc
- if (cur_conf->dtim_period == 0)
- cur_conf->dtim_period = 1;
-
-- ath_set_beacon(sc);
- }
-
--static bool ath_has_valid_bslot(struct ath_softc *sc)
-+void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+ u32 changed)
- {
-- struct ath_vif *avp;
-- int slot;
-- bool found = false;
-+ struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-+ struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-
-- for (slot = 0; slot < ATH_BCBUF; slot++) {
-- if (sc->beacon.bslot[slot]) {
-- avp = (void *)sc->beacon.bslot[slot]->drv_priv;
-- if (avp->is_bslot_active) {
-- found = true;
-- break;
-- }
-+ ath9k_cache_beacon_config(sc, bss_conf);
-+
-+ if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-+ ath9k_set_beacon(sc);
-+ set_bit(SC_OP_BEACONS, &sc->sc_flags);
-+ } else {
-+ /*
-+ * Take care of multiple interfaces when
-+ * enabling/disabling SWBA.
-+ */
-+ if (changed & BSS_CHANGED_BEACON_ENABLED) {
-+ if (!bss_conf->enable_beacon &&
-+ (sc->nbcnvifs <= 1))
-+ cur_conf->enable_beacon = false;
-+ else if (bss_conf->enable_beacon)
-+ cur_conf->enable_beacon = true;
- }
-+
-+ ath9k_set_beacon(sc);
-+
-+ if (cur_conf->enable_beacon)
-+ set_bit(SC_OP_BEACONS, &sc->sc_flags);
-+ else
-+ clear_bit(SC_OP_BEACONS, &sc->sc_flags);
- }
-- return found;
- }
-
--
--void ath_set_beacon(struct ath_softc *sc)
-+void ath9k_set_beacon(struct ath_softc *sc)
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-
- switch (sc->sc_ah->opmode) {
- case NL80211_IFTYPE_AP:
-- if (ath_has_valid_bslot(sc))
-- ath_beacon_config_ap(sc, cur_conf);
-+ ath9k_beacon_config_ap(sc, cur_conf);
- break;
- case NL80211_IFTYPE_ADHOC:
- case NL80211_IFTYPE_MESH_POINT:
-- ath_beacon_config_adhoc(sc, cur_conf);
-+ ath9k_beacon_config_adhoc(sc, cur_conf);
- break;
- case NL80211_IFTYPE_STATION:
-- ath_beacon_config_sta(sc, cur_conf);
-+ ath9k_beacon_config_sta(sc, cur_conf);
- break;
- default:
- ath_dbg(common, CONFIG, "Unsupported beaconing mode\n");
- return;
- }
--
-- set_bit(SC_OP_BEACONS, &sc->sc_flags);
--}
--
--void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
--{
-- struct ath_hw *ah = sc->sc_ah;
--
-- if (!ath_has_valid_bslot(sc)) {
-- clear_bit(SC_OP_BEACONS, &sc->sc_flags);
-- return;
-- }
--
-- ath9k_ps_wakeup(sc);
-- if (status) {
-- /* Re-enable beaconing */
-- ah->imask |= ATH9K_INT_SWBA;
-- ath9k_hw_set_interrupts(ah);
-- } else {
-- /* Disable SWBA interrupt */
-- ah->imask &= ~ATH9K_INT_SWBA;
-- ath9k_hw_set_interrupts(ah);
-- tasklet_kill(&sc->bcon_tasklet);
-- ath9k_hw_stop_dma_queue(ah, sc->beacon.beaconq);
-- }
-- ath9k_ps_restore(sc);
- }
---- a/drivers/net/wireless/ath/ath9k/calib.h
-+++ b/drivers/net/wireless/ath/ath9k/calib.h
-@@ -30,10 +30,10 @@ struct ar5416IniArray {
- u32 ia_columns;
- };
-
--#define INIT_INI_ARRAY(iniarray, array, rows, columns) do { \
-+#define INIT_INI_ARRAY(iniarray, array) do { \
- (iniarray)->ia_array = (u32 *)(array); \
-- (iniarray)->ia_rows = (rows); \
-- (iniarray)->ia_columns = (columns); \
-+ (iniarray)->ia_rows = ARRAY_SIZE(array); \
-+ (iniarray)->ia_columns = ARRAY_SIZE(array[0]); \
- } while (0)
-
- #define INI_RA(iniarray, row, column) \
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -206,10 +206,9 @@ static ssize_t write_file_disable_ani(st
-
- if (disable_ani) {
- clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- del_timer_sync(&common->ani.timer);
-+ ath_stop_ani(sc);
- } else {
-- set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- ath_start_ani(common);
-+ ath_check_ani(sc);
- }
-
- return count;
-@@ -1556,6 +1555,14 @@ int ath9k_init_debug(struct ath_hw *ah)
- &fops_interrupt);
- debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_xmit);
-+ debugfs_create_u32("qlen_bk", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+ &sc->tx.txq_max_pending[WME_AC_BK]);
-+ debugfs_create_u32("qlen_be", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+ &sc->tx.txq_max_pending[WME_AC_BE]);
-+ debugfs_create_u32("qlen_vi", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+ &sc->tx.txq_max_pending[WME_AC_VI]);
-+ debugfs_create_u32("qlen_vo", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+ &sc->tx.txq_max_pending[WME_AC_VO]);
- debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_stations);
- debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -32,6 +32,19 @@ struct ath_buf;
- #define RESET_STAT_INC(sc, type) do { } while (0)
- #endif
-
-+enum ath_reset_type {
-+ RESET_TYPE_BB_HANG,
-+ RESET_TYPE_BB_WATCHDOG,
-+ RESET_TYPE_FATAL_INT,
-+ RESET_TYPE_TX_ERROR,
-+ RESET_TYPE_TX_HANG,
-+ RESET_TYPE_PLL_HANG,
-+ RESET_TYPE_MAC_HANG,
-+ RESET_TYPE_BEACON_STUCK,
-+ RESET_TYPE_MCI,
-+ __RESET_TYPE_MAX
-+};
-+
- #ifdef CONFIG_ATH9K_DEBUGFS
-
- /**
-@@ -209,17 +222,6 @@ struct ath_rx_stats {
- u32 rx_frags;
- };
-
--enum ath_reset_type {
-- RESET_TYPE_BB_HANG,
-- RESET_TYPE_BB_WATCHDOG,
-- RESET_TYPE_FATAL_INT,
-- RESET_TYPE_TX_ERROR,
-- RESET_TYPE_TX_HANG,
-- RESET_TYPE_PLL_HANG,
-- RESET_TYPE_MAC_HANG,
-- __RESET_TYPE_MAX
--};
--
- struct ath_stats {
- struct ath_interrupt_stats istats;
- struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
---- a/drivers/net/wireless/ath/ath9k/eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
-@@ -241,16 +241,12 @@ enum eeprom_param {
- EEP_TEMPSENSE_SLOPE,
- EEP_TEMPSENSE_SLOPE_PAL_ON,
- EEP_PWR_TABLE_OFFSET,
-- EEP_DRIVE_STRENGTH,
-- EEP_INTERNAL_REGULATOR,
-- EEP_SWREG,
- EEP_PAPRD,
- EEP_MODAL_VER,
- EEP_ANT_DIV_CTL1,
- EEP_CHAIN_MASK_REDUCE,
- EEP_ANTENNA_GAIN_2G,
- EEP_ANTENNA_GAIN_5G,
-- EEP_QUICK_DROP
- };
-
- enum ar5416_rates {
---- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-@@ -1111,7 +1111,7 @@ static int ath9k_htc_add_interface(struc
-
- if ((priv->ah->opmode == NL80211_IFTYPE_AP) &&
- !test_bit(OP_ANI_RUNNING, &priv->op_flags)) {
-- ath9k_hw_set_tsfadjust(priv->ah, 1);
-+ ath9k_hw_set_tsfadjust(priv->ah, true);
- ath9k_htc_start_ani(priv);
- }
-
-@@ -1351,7 +1351,7 @@ static int ath9k_htc_conf_tx(struct ieee
- qi.tqi_aifs = params->aifs;
- qi.tqi_cwmin = params->cw_min;
- qi.tqi_cwmax = params->cw_max;
-- qi.tqi_burstTime = params->txop;
-+ qi.tqi_burstTime = params->txop * 32;
-
- qnum = get_hw_qnum(queue, priv->hwq_map);
-
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -671,10 +671,6 @@ static int __ath9k_hw_init(struct ath_hw
- if (!AR_SREV_9300_20_OR_LATER(ah))
- ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
-
-- /* disable ANI for 9340 */
-- if (AR_SREV_9340(ah))
-- ah->config.enable_ani = false;
--
- ath9k_hw_init_mode_regs(ah);
-
- if (!ah->is_pciexpress)
-@@ -2916,9 +2912,9 @@ void ath9k_hw_reset_tsf(struct ath_hw *a
- }
- EXPORT_SYMBOL(ath9k_hw_reset_tsf);
-
--void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting)
-+void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set)
- {
-- if (setting)
-+ if (set)
- ah->misc_mode |= AR_PCU_TX_ADD_TSF;
- else
- ah->misc_mode &= ~AR_PCU_TX_ADD_TSF;
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -994,7 +994,7 @@ u32 ath9k_hw_gettsf32(struct ath_hw *ah)
- u64 ath9k_hw_gettsf64(struct ath_hw *ah);
- void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
- void ath9k_hw_reset_tsf(struct ath_hw *ah);
--void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);
-+void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set);
- void ath9k_hw_init_global_settings(struct ath_hw *ah);
- u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah);
- void ath9k_hw_set11nmac2040(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -436,6 +436,7 @@ static int ath9k_init_queues(struct ath_
- for (i = 0; i < WME_NUM_AC; i++) {
- sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
- sc->tx.txq_map[i]->mac80211_qnum = i;
-+ sc->tx.txq_max_pending[i] = ATH_MAX_QDEPTH;
- }
- return 0;
- }
-@@ -560,7 +561,7 @@ static int ath9k_init_softc(u16 devid, s
- spin_lock_init(&sc->debug.samp_lock);
- #endif
- tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
-- tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
-+ tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
- (unsigned long)sc);
-
- INIT_WORK(&sc->hw_reset_work, ath_reset_work);
---- a/drivers/net/wireless/ath/ath9k/link.c
-+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -50,8 +50,7 @@ void ath_tx_complete_poll_work(struct wo
- if (needreset) {
- ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
- "tx hung, resetting the chip\n");
-- RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, RESET_TYPE_TX_HANG);
- return;
- }
-
-@@ -69,6 +68,7 @@ void ath_hw_check(struct work_struct *wo
- unsigned long flags;
- int busy;
- u8 is_alive, nbeacon = 1;
-+ enum ath_reset_type type;
-
- ath9k_ps_wakeup(sc);
- is_alive = ath9k_hw_check_alive(sc->sc_ah);
-@@ -78,7 +78,7 @@ void ath_hw_check(struct work_struct *wo
- else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
- ath_dbg(common, RESET,
- "DCU stuck is detected. Schedule chip reset\n");
-- RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
-+ type = RESET_TYPE_MAC_HANG;
- goto sched_reset;
- }
-
-@@ -90,7 +90,7 @@ void ath_hw_check(struct work_struct *wo
- busy, sc->hw_busy_count + 1);
- if (busy >= 99) {
- if (++sc->hw_busy_count >= 3) {
-- RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
-+ type = RESET_TYPE_BB_HANG;
- goto sched_reset;
- }
- } else if (busy >= 0) {
-@@ -102,7 +102,7 @@ void ath_hw_check(struct work_struct *wo
- goto out;
-
- sched_reset:
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, type);
- out:
- ath9k_ps_restore(sc);
- }
-@@ -119,8 +119,7 @@ static bool ath_hw_pll_rx_hang_check(str
- count++;
- if (count == 3) {
- ath_dbg(common, RESET, "PLL WAR, resetting the chip\n");
-- RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, RESET_TYPE_PLL_HANG);
- count = 0;
- return true;
- }
-@@ -432,26 +431,69 @@ set_timer:
- }
- }
-
--void ath_start_ani(struct ath_common *common)
-+void ath_start_ani(struct ath_softc *sc)
- {
-- struct ath_hw *ah = common->ah;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
- unsigned long timestamp = jiffies_to_msecs(jiffies);
-- struct ath_softc *sc = (struct ath_softc *) common->priv;
-
-- if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags))
-- return;
--
-- if (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
-+ if (common->disable_ani ||
-+ !test_bit(SC_OP_ANI_RUN, &sc->sc_flags) ||
-+ (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
- return;
-
- common->ani.longcal_timer = timestamp;
- common->ani.shortcal_timer = timestamp;
- common->ani.checkani_timer = timestamp;
-
-+ ath_dbg(common, ANI, "Starting ANI\n");
- mod_timer(&common->ani.timer,
- jiffies + msecs_to_jiffies((u32)ah->config.ani_poll_interval));
- }
-
-+void ath_stop_ani(struct ath_softc *sc)
-+{
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+
-+ ath_dbg(common, ANI, "Stopping ANI\n");
-+ del_timer_sync(&common->ani.timer);
-+}
-+
-+void ath_check_ani(struct ath_softc *sc)
-+{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+
-+ /*
-+ * Check for the various conditions in which ANI has to
-+ * be stopped.
-+ */
-+ if (ah->opmode == NL80211_IFTYPE_ADHOC) {
-+ if (!cur_conf->enable_beacon)
-+ goto stop_ani;
-+ } else if (ah->opmode == NL80211_IFTYPE_AP) {
-+ if (!cur_conf->enable_beacon) {
-+ /*
-+ * Disable ANI only when there are no
-+ * associated stations.
-+ */
-+ if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-+ goto stop_ani;
-+ }
-+ } else if (ah->opmode == NL80211_IFTYPE_STATION) {
-+ if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-+ goto stop_ani;
-+ }
-+
-+ set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-+ ath_start_ani(sc);
-+ return;
-+
-+stop_ani:
-+ clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-+ ath_stop_ani(sc);
-+}
-+
- void ath_update_survey_nf(struct ath_softc *sc, int channel)
- {
- struct ath_hw *ah = sc->sc_ah;
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -167,8 +167,6 @@ static void ath_cancel_work(struct ath_s
-
- static void ath_restart_work(struct ath_softc *sc)
- {
-- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--
- ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-
- if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) ||
-@@ -177,21 +175,18 @@ static void ath_restart_work(struct ath_
- msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
-
- ath_start_rx_poll(sc, 3);
--
-- if (!common->disable_ani)
-- ath_start_ani(common);
-+ ath_start_ani(sc);
- }
-
- static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
- {
- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
- bool ret = true;
-
- ieee80211_stop_queues(sc->hw);
-
- sc->hw_busy_count = 0;
-- del_timer_sync(&common->ani.timer);
-+ ath_stop_ani(sc);
- del_timer_sync(&sc->rx_poll_timer);
-
- ath9k_debug_samp_bb_mac(sc);
-@@ -236,7 +231,7 @@ static bool ath_complete_reset(struct at
- if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
- goto work;
-
-- ath_set_beacon(sc);
-+ ath9k_set_beacon(sc);
-
- if (ah->opmode == NL80211_IFTYPE_STATION &&
- test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-@@ -365,6 +360,7 @@ void ath9k_tasklet(unsigned long data)
- struct ath_softc *sc = (struct ath_softc *)data;
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-+ enum ath_reset_type type;
- unsigned long flags;
- u32 status = sc->intrstatus;
- u32 rxmask;
-@@ -374,18 +370,13 @@ void ath9k_tasklet(unsigned long data)
-
- if ((status & ATH9K_INT_FATAL) ||
- (status & ATH9K_INT_BB_WATCHDOG)) {
--#ifdef CONFIG_ATH9K_DEBUGFS
-- enum ath_reset_type type;
-
- if (status & ATH9K_INT_FATAL)
- type = RESET_TYPE_FATAL_INT;
- else
- type = RESET_TYPE_BB_WATCHDOG;
-
-- RESET_STAT_INC(sc, type);
--#endif
-- set_bit(SC_OP_HW_RESET, &sc->sc_flags);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, type);
- goto out;
- }
-
-@@ -586,6 +577,15 @@ static int ath_reset(struct ath_softc *s
- return r;
- }
-
-+void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type)
-+{
-+#ifdef CONFIG_ATH9K_DEBUGFS
-+ RESET_STAT_INC(sc, type);
-+#endif
-+ set_bit(SC_OP_HW_RESET, &sc->sc_flags);
-+ ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+}
-+
- void ath_reset_work(struct work_struct *work)
- {
- struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
-@@ -852,16 +852,6 @@ bool ath9k_uses_beacons(int type)
- }
- }
-
--static void ath9k_reclaim_beacon(struct ath_softc *sc,
-- struct ieee80211_vif *vif)
--{
-- struct ath_vif *avp = (void *)vif->drv_priv;
--
-- ath9k_set_beaconing_status(sc, false);
-- ath_beacon_return(sc, avp);
-- ath9k_set_beaconing_status(sc, true);
--}
--
- static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
- {
- struct ath9k_vif_iter_data *iter_data = data;
-@@ -929,18 +919,14 @@ static void ath9k_calculate_summary_stat
-
- ath9k_calculate_iter_data(hw, vif, &iter_data);
-
-- /* Set BSSID mask. */
- memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
- ath_hw_setbssidmask(common);
-
-- /* Set op-mode & TSF */
- if (iter_data.naps > 0) {
-- ath9k_hw_set_tsfadjust(ah, 1);
-- set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-+ ath9k_hw_set_tsfadjust(ah, true);
- ah->opmode = NL80211_IFTYPE_AP;
- } else {
-- ath9k_hw_set_tsfadjust(ah, 0);
-- clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-+ ath9k_hw_set_tsfadjust(ah, false);
-
- if (iter_data.nmeshes)
- ah->opmode = NL80211_IFTYPE_MESH_POINT;
-@@ -952,45 +938,14 @@ static void ath9k_calculate_summary_stat
- ah->opmode = NL80211_IFTYPE_STATION;
- }
-
-- /*
-- * Enable MIB interrupts when there are hardware phy counters.
-- */
-+ ath9k_hw_setopmode(ah);
-+
- if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0)
- ah->imask |= ATH9K_INT_TSFOOR;
- else
- ah->imask &= ~ATH9K_INT_TSFOOR;
-
- ath9k_hw_set_interrupts(ah);
--
-- /* Set up ANI */
-- if (iter_data.naps > 0) {
-- sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
--
-- if (!common->disable_ani) {
-- set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- ath_start_ani(common);
-- }
--
-- } else {
-- clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- del_timer_sync(&common->ani.timer);
-- }
--}
--
--/* Called with sc->mutex held, vif counts set up properly. */
--static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
-- struct ieee80211_vif *vif)
--{
-- struct ath_softc *sc = hw->priv;
--
-- ath9k_calculate_summary_state(hw, vif);
--
-- if (ath9k_uses_beacons(vif->type)) {
-- /* Reserve a beacon slot for the vif */
-- ath9k_set_beaconing_status(sc, false);
-- ath_beacon_alloc(sc, vif);
-- ath9k_set_beaconing_status(sc, true);
-- }
- }
-
- static int ath9k_add_interface(struct ieee80211_hw *hw,
-@@ -1032,7 +987,10 @@ static int ath9k_add_interface(struct ie
-
- sc->nvifs++;
-
-- ath9k_do_vif_add_setup(hw, vif);
-+ ath9k_calculate_summary_state(hw, vif);
-+ if (ath9k_uses_beacons(vif->type))
-+ ath9k_beacon_assign_slot(sc, vif);
-+
- out:
- mutex_unlock(&sc->mutex);
- ath9k_ps_restore(sc);
-@@ -1049,6 +1007,7 @@ static int ath9k_change_interface(struct
- int ret = 0;
-
- ath_dbg(common, CONFIG, "Change Interface\n");
-+
- mutex_lock(&sc->mutex);
- ath9k_ps_wakeup(sc);
-
-@@ -1061,15 +1020,16 @@ static int ath9k_change_interface(struct
- }
- }
-
-- /* Clean up old vif stuff */
- if (ath9k_uses_beacons(vif->type))
-- ath9k_reclaim_beacon(sc, vif);
-+ ath9k_beacon_remove_slot(sc, vif);
-
-- /* Add new settings */
- vif->type = new_type;
- vif->p2p = p2p;
-
-- ath9k_do_vif_add_setup(hw, vif);
-+ ath9k_calculate_summary_state(hw, vif);
-+ if (ath9k_uses_beacons(vif->type))
-+ ath9k_beacon_assign_slot(sc, vif);
-+
- out:
- ath9k_ps_restore(sc);
- mutex_unlock(&sc->mutex);
-@@ -1089,9 +1049,8 @@ static void ath9k_remove_interface(struc
-
- sc->nvifs--;
-
-- /* Reclaim beacon resources */
- if (ath9k_uses_beacons(vif->type))
-- ath9k_reclaim_beacon(sc, vif);
-+ ath9k_beacon_remove_slot(sc, vif);
-
- ath9k_calculate_summary_state(hw, NULL);
-
-@@ -1388,21 +1347,18 @@ static int ath9k_conf_tx(struct ieee8021
- qi.tqi_aifs = params->aifs;
- qi.tqi_cwmin = params->cw_min;
- qi.tqi_cwmax = params->cw_max;
-- qi.tqi_burstTime = params->txop;
-+ qi.tqi_burstTime = params->txop * 32;
-
- ath_dbg(common, CONFIG,
- "Configure tx [queue/halq] [%d/%d], aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n",
- queue, txq->axq_qnum, params->aifs, params->cw_min,
- params->cw_max, params->txop);
-
-+ ath_update_max_aggr_framelen(sc, queue, qi.tqi_burstTime);
- ret = ath_txq_update(sc, txq->axq_qnum, &qi);
- if (ret)
- ath_err(common, "TXQ Update failed\n");
-
-- if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
-- if (queue == WME_AC_BE && !ret)
-- ath_beaconq_config(sc);
--
- mutex_unlock(&sc->mutex);
- ath9k_ps_restore(sc);
-
-@@ -1471,85 +1427,36 @@ static int ath9k_set_key(struct ieee8021
-
- return ret;
- }
--static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
-+
-+static void ath9k_bss_assoc_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
- {
- struct ath_softc *sc = data;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
- struct ath_vif *avp = (void *)vif->drv_priv;
-+ struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
- unsigned long flags;
-- /*
-- * Skip iteration if primary station vif's bss info
-- * was not changed
-- */
-+
- if (test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
- return;
-
- if (bss_conf->assoc) {
- set_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
- avp->primary_sta_vif = true;
-+
- memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
- common->curaid = bss_conf->aid;
- ath9k_hw_write_associd(sc->sc_ah);
-- ath_dbg(common, CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",
-- bss_conf->aid, common->curbssid);
-- ath_beacon_config(sc, vif);
-- /*
-- * Request a re-configuration of Beacon related timers
-- * on the receipt of the first Beacon frame (i.e.,
-- * after time sync with the AP).
-- */
-- spin_lock_irqsave(&sc->sc_pm_lock, flags);
-- sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
-- spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
-
-- /* Reset rssi stats */
- sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
- sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
-
-- ath_start_rx_poll(sc, 3);
--
-- if (!common->disable_ani) {
-- set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- ath_start_ani(common);
-- }
--
-- }
--}
--
--static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
--{
-- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-- struct ath_vif *avp = (void *)vif->drv_priv;
--
-- if (sc->sc_ah->opmode != NL80211_IFTYPE_STATION)
-- return;
--
-- /* Reconfigure bss info */
-- if (avp->primary_sta_vif && !bss_conf->assoc) {
-- ath_dbg(common, CONFIG, "Bss Info DISASSOC %d, bssid %pM\n",
-- common->curaid, common->curbssid);
-- clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
-- clear_bit(SC_OP_BEACONS, &sc->sc_flags);
-- avp->primary_sta_vif = false;
-- memset(common->curbssid, 0, ETH_ALEN);
-- common->curaid = 0;
-- }
--
-- ieee80211_iterate_active_interfaces_atomic(
-- sc->hw, ath9k_bss_iter, sc);
-+ spin_lock_irqsave(&sc->sc_pm_lock, flags);
-+ sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
-+ spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
-
-- /*
-- * None of station vifs are associated.
-- * Clear bssid & aid
-- */
-- if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-- ath9k_hw_write_associd(sc->sc_ah);
-- clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- del_timer_sync(&common->ani.timer);
-- del_timer_sync(&sc->rx_poll_timer);
-- memset(&sc->caldata, 0, sizeof(sc->caldata));
-+ ath_dbg(common, CONFIG,
-+ "Primary Station interface: %pM, BSSID: %pM\n",
-+ vif->addr, common->curbssid);
- }
- }
-
-@@ -1558,6 +1465,11 @@ static void ath9k_bss_info_changed(struc
- struct ieee80211_bss_conf *bss_conf,
- u32 changed)
- {
-+#define CHECK_ANI \
-+ (BSS_CHANGED_ASSOC | \
-+ BSS_CHANGED_IBSS | \
-+ BSS_CHANGED_BEACON_ENABLED)
-+
- struct ath_softc *sc = hw->priv;
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -1568,53 +1480,43 @@ static void ath9k_bss_info_changed(struc
- mutex_lock(&sc->mutex);
-
- if (changed & BSS_CHANGED_ASSOC) {
-- ath9k_config_bss(sc, vif);
-+ ath_dbg(common, CONFIG, "BSSID %pM Changed ASSOC %d\n",
-+ bss_conf->bssid, bss_conf->assoc);
-
-- ath_dbg(common, CONFIG, "BSSID: %pM aid: 0x%x\n",
-- common->curbssid, common->curaid);
-+ /*
-+ * Do not do anything when the opmode is not STATION.
-+ */
-+ if (ah->opmode == NL80211_IFTYPE_STATION) {
-+ if (avp->primary_sta_vif && !bss_conf->assoc) {
-+ clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
-+ clear_bit(SC_OP_BEACONS, &sc->sc_flags);
-+ avp->primary_sta_vif = false;
-+ }
-+
-+ ieee80211_iterate_active_interfaces_atomic(sc->hw,
-+ ath9k_bss_assoc_iter, sc);
-+
-+ if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-+ memset(common->curbssid, 0, ETH_ALEN);
-+ common->curaid = 0;
-+ ath9k_hw_write_associd(sc->sc_ah);
-+ }
-+ }
- }
-
- if (changed & BSS_CHANGED_IBSS) {
-- /* There can be only one vif available */
- memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
- common->curaid = bss_conf->aid;
- ath9k_hw_write_associd(sc->sc_ah);
--
-- if (bss_conf->ibss_joined) {
-- sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
--
-- if (!common->disable_ani) {
-- set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- ath_start_ani(common);
-- }
--
-- } else {
-- clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-- del_timer_sync(&common->ani.timer);
-- del_timer_sync(&sc->rx_poll_timer);
-- }
- }
-
-- /*
-- * In case of AP mode, the HW TSF has to be reset
-- * when the beacon interval changes.
-- */
-- if ((changed & BSS_CHANGED_BEACON_INT) &&
-- (vif->type == NL80211_IFTYPE_AP))
-- set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
--
-- /* Configure beaconing (AP, IBSS, MESH) */
-- if (ath9k_uses_beacons(vif->type) &&
-- ((changed & BSS_CHANGED_BEACON) ||
-- (changed & BSS_CHANGED_BEACON_ENABLED) ||
-- (changed & BSS_CHANGED_BEACON_INT))) {
-- ath9k_set_beaconing_status(sc, false);
-- if (bss_conf->enable_beacon)
-- ath_beacon_alloc(sc, vif);
-- else
-- avp->is_bslot_active = false;
-- ath_beacon_config(sc, vif);
-- ath9k_set_beaconing_status(sc, true);
-+ if ((changed & BSS_CHANGED_BEACON) ||
-+ (changed & BSS_CHANGED_BEACON_ENABLED) ||
-+ (changed & BSS_CHANGED_BEACON_INT)) {
-+ if (ah->opmode == NL80211_IFTYPE_AP)
-+ ath9k_set_tsfadjust(sc, vif);
-+ if (ath9k_allow_beacon_config(sc, vif))
-+ ath9k_beacon_config(sc, vif, changed);
- }
-
- if (changed & BSS_CHANGED_ERP_SLOT) {
-@@ -1636,8 +1538,13 @@ static void ath9k_bss_info_changed(struc
- }
- }
-
-+ if (changed & CHECK_ANI)
-+ ath_check_ani(sc);
-+
- mutex_unlock(&sc->mutex);
- ath9k_ps_restore(sc);
-+
-+#undef CHECK_ANI
- }
-
- static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-@@ -1866,10 +1773,11 @@ static int ath9k_tx_last_beacon(struct i
- if (!vif)
- return 0;
-
-- avp = (void *)vif->drv_priv;
-- if (!avp->is_bslot_active)
-+ if (!vif->bss_conf.enable_beacon)
- return 0;
-
-+ avp = (void *)vif->drv_priv;
-+
- if (!sc->beacon.tx_processed && !edma) {
- tasklet_disable(&sc->bcon_tasklet);
-
-@@ -1923,12 +1831,29 @@ static u32 fill_chainmask(u32 cap, u32 n
- return filled;
- }
-
-+static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
-+{
-+ switch (val & 0x7) {
-+ case 0x1:
-+ case 0x3:
-+ case 0x7:
-+ return true;
-+ case 0x2:
-+ return (ah->caps.rx_chainmask == 1);
-+ default:
-+ return false;
-+ }
-+}
-+
- static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
- {
- struct ath_softc *sc = hw->priv;
- struct ath_hw *ah = sc->sc_ah;
-
-- if (!rx_ant || !tx_ant)
-+ if (ah->caps.rx_chainmask != 1)
-+ rx_ant |= tx_ant;
-+
-+ if (!validate_antenna_mask(ah, rx_ant) || !tx_ant)
- return -EINVAL;
-
- sc->ant_rx = rx_ant;
---- a/drivers/net/wireless/ath/ath9k/mci.c
-+++ b/drivers/net/wireless/ath/ath9k/mci.c
-@@ -202,7 +202,7 @@ static void ath_mci_cal_msg(struct ath_s
- case MCI_GPM_BT_CAL_REQ:
- if (mci_hw->bt_state == MCI_BT_AWAKE) {
- ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+ ath9k_queue_reset(sc, RESET_TYPE_MCI);
- }
- ath_dbg(common, MCI, "MCI State : %d\n", mci_hw->bt_state);
- break;
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -553,7 +553,7 @@ static void ath_rx_ps_beacon(struct ath_
- sc->ps_flags &= ~PS_BEACON_SYNC;
- ath_dbg(common, PS,
- "Reconfigure Beacon timers based on timestamp from the AP\n");
-- ath_set_beacon(sc);
-+ ath9k_set_beacon(sc);
- }
-
- if (ath_beacon_dtim_pending_cab(skb)) {
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -29,6 +29,8 @@
- #define HT_LTF(_ns) (4 * (_ns))
- #define SYMBOL_TIME(_ns) ((_ns) << 2) /* ns * 4 us */
- #define SYMBOL_TIME_HALFGI(_ns) (((_ns) * 18 + 4) / 5) /* ns * 3.6 us */
-+#define TIME_SYMBOLS(t) ((t) >> 2)
-+#define TIME_SYMBOLS_HALFGI(t) (((t) * 5 - 4) / 18)
- #define NUM_SYMBOLS_PER_USEC(_usec) (_usec >> 2)
- #define NUM_SYMBOLS_PER_USEC_HALFGI(_usec) (((_usec*5)-4)/18)
-
-@@ -74,33 +76,6 @@ enum {
- MCS_HT40_SGI,
- };
-
--static int ath_max_4ms_framelen[4][32] = {
-- [MCS_HT20] = {
-- 3212, 6432, 9648, 12864, 19300, 25736, 28952, 32172,
-- 6424, 12852, 19280, 25708, 38568, 51424, 57852, 64280,
-- 9628, 19260, 28896, 38528, 57792, 65532, 65532, 65532,
-- 12828, 25656, 38488, 51320, 65532, 65532, 65532, 65532,
-- },
-- [MCS_HT20_SGI] = {
-- 3572, 7144, 10720, 14296, 21444, 28596, 32172, 35744,
-- 7140, 14284, 21428, 28568, 42856, 57144, 64288, 65532,
-- 10700, 21408, 32112, 42816, 64228, 65532, 65532, 65532,
-- 14256, 28516, 42780, 57040, 65532, 65532, 65532, 65532,
-- },
-- [MCS_HT40] = {
-- 6680, 13360, 20044, 26724, 40092, 53456, 60140, 65532,
-- 13348, 26700, 40052, 53400, 65532, 65532, 65532, 65532,
-- 20004, 40008, 60016, 65532, 65532, 65532, 65532, 65532,
-- 26644, 53292, 65532, 65532, 65532, 65532, 65532, 65532,
-- },
-- [MCS_HT40_SGI] = {
-- 7420, 14844, 22272, 29696, 44544, 59396, 65532, 65532,
-- 14832, 29668, 44504, 59340, 65532, 65532, 65532, 65532,
-- 22232, 44464, 65532, 65532, 65532, 65532, 65532, 65532,
-- 29616, 59232, 65532, 65532, 65532, 65532, 65532, 65532,
-- }
--};
--
- /*********************/
- /* Aggregation logic */
- /*********************/
-@@ -614,10 +589,8 @@ static void ath_tx_complete_aggr(struct
-
- rcu_read_unlock();
-
-- if (needreset) {
-- RESET_STAT_INC(sc, RESET_TYPE_TX_ERROR);
-- ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-- }
-+ if (needreset)
-+ ath9k_queue_reset(sc, RESET_TYPE_TX_ERROR);
- }
-
- static bool ath_lookup_legacy(struct ath_buf *bf)
-@@ -650,6 +623,7 @@ static u32 ath_lookup_rate(struct ath_so
- struct ieee80211_tx_rate *rates;
- u32 max_4ms_framelen, frmlen;
- u16 aggr_limit, bt_aggr_limit, legacy = 0;
-+ int q = tid->ac->txq->mac80211_qnum;
- int i;
-
- skb = bf->bf_mpdu;
-@@ -658,8 +632,7 @@ static u32 ath_lookup_rate(struct ath_so
+--- a/drivers/net/wireless/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/rt2x00/rt2800lib.c
+@@ -5090,7 +5090,8 @@ static int rt2800_probe_hw_mode(struct r
+ IEEE80211_HW_SUPPORTS_PS |
+ IEEE80211_HW_PS_NULLFUNC_STACK |
+ IEEE80211_HW_AMPDU_AGGREGATION |
+- IEEE80211_HW_REPORTS_TX_ACK_STATUS;
++ IEEE80211_HW_REPORTS_TX_ACK_STATUS |
++ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL;
/*
- * Find the lowest frame length among the rate series that will have a
-- * 4ms transmit duration.
-- * TODO - TXOP limit needs to be considered.
-+ * 4ms (or TXOP limited) transmit duration.
- */
- max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;
-
-@@ -682,7 +655,7 @@ static u32 ath_lookup_rate(struct ath_so
- if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
- modeidx++;
-
-- frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
-+ frmlen = sc->tx.max_aggr_framelen[q][modeidx][rates[i].idx];
- max_4ms_framelen = min(max_4ms_framelen, frmlen);
- }
-
-@@ -929,6 +902,44 @@ static u32 ath_pkt_duration(struct ath_s
- return duration;
- }
-
-+static int ath_max_framelen(int usec, int mcs, bool ht40, bool sgi)
-+{
-+ int streams = HT_RC_2_STREAMS(mcs);
-+ int symbols, bits;
-+ int bytes = 0;
-+
-+ symbols = sgi ? TIME_SYMBOLS_HALFGI(usec) : TIME_SYMBOLS(usec);
-+ bits = symbols * bits_per_symbol[mcs % 8][ht40] * streams;
-+ bits -= OFDM_PLCP_BITS;
-+ bytes = bits / 8;
-+ bytes -= L_STF + L_LTF + L_SIG + HT_SIG + HT_STF + HT_LTF(streams);
-+ if (bytes > 65532)
-+ bytes = 65532;
-+
-+ return bytes;
-+}
-+
-+void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop)
-+{
-+ u16 *cur_ht20, *cur_ht20_sgi, *cur_ht40, *cur_ht40_sgi;
-+ int mcs;
-+
-+ /* 4ms is the default (and maximum) duration */
-+ if (!txop || txop > 4096)
-+ txop = 4096;
-+
-+ cur_ht20 = sc->tx.max_aggr_framelen[queue][MCS_HT20];
-+ cur_ht20_sgi = sc->tx.max_aggr_framelen[queue][MCS_HT20_SGI];
-+ cur_ht40 = sc->tx.max_aggr_framelen[queue][MCS_HT40];
-+ cur_ht40_sgi = sc->tx.max_aggr_framelen[queue][MCS_HT40_SGI];
-+ for (mcs = 0; mcs < 32; mcs++) {
-+ cur_ht20[mcs] = ath_max_framelen(txop, mcs, false, false);
-+ cur_ht20_sgi[mcs] = ath_max_framelen(txop, mcs, false, true);
-+ cur_ht40[mcs] = ath_max_framelen(txop, mcs, true, false);
-+ cur_ht40_sgi[mcs] = ath_max_framelen(txop, mcs, true, true);
-+ }
-+}
+ * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -392,10 +392,9 @@ void rt2x00lib_txdone(struct queue_entry
+ tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
+ tx_info->status.ampdu_len = 1;
+ tx_info->status.ampdu_ack_len = success ? 1 : 0;
+- /*
+- * TODO: Need to tear down BA session here
+- * if not successful.
+- */
+
- static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
- struct ath_tx_info *info, int len)
- {
-@@ -1586,7 +1597,8 @@ void ath_txq_schedule(struct ath_softc *
- struct ath_atx_ac *ac, *ac_tmp, *last_ac;
- struct ath_atx_tid *tid, *last_tid;
-
-- if (work_pending(&sc->hw_reset_work) || list_empty(&txq->axq_acq) ||
-+ if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) ||
-+ list_empty(&txq->axq_acq) ||
- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
- return;
-
-@@ -1988,7 +2000,8 @@ int ath_tx_start(struct ieee80211_hw *hw
-
- ath_txq_lock(sc, txq);
- if (txq == sc->tx.txq_map[q] &&
-- ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-+ ++txq->pending_frames > sc->tx.txq_max_pending[q] &&
-+ !txq->stopped) {
- ieee80211_stop_queue(sc->hw, q);
- txq->stopped = true;
- }
-@@ -2047,7 +2060,8 @@ static void ath_tx_complete(struct ath_s
- if (WARN_ON(--txq->pending_frames < 0))
- txq->pending_frames = 0;
-
-- if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
-+ if (txq->stopped &&
-+ txq->pending_frames < sc->tx.txq_max_pending[q]) {
- ieee80211_wake_queue(sc->hw, q);
- txq->stopped = false;
- }
-@@ -2191,7 +2205,7 @@ static void ath_tx_processq(struct ath_s
-
- ath_txq_lock(sc, txq);
- for (;;) {
-- if (work_pending(&sc->hw_reset_work))
-+ if (test_bit(SC_OP_HW_RESET, &sc->sc_flags))
- break;
-
- if (list_empty(&txq->axq_q)) {
-@@ -2274,7 +2288,7 @@ void ath_tx_edma_tasklet(struct ath_soft
- int status;
-
- for (;;) {
-- if (work_pending(&sc->hw_reset_work))
-+ if (test_bit(SC_OP_HW_RESET, &sc->sc_flags))
- break;
-
- status = ath9k_hw_txprocdesc(ah, NULL, (void *)&ts);
---- a/drivers/net/wireless/b43/xmit.c
-+++ b/drivers/net/wireless/b43/xmit.c
-@@ -663,7 +663,7 @@ void b43_rx(struct b43_wldev *dev, struc
- u32 uninitialized_var(macstat);
- u16 chanid;
- u16 phytype;
-- int padding;
-+ int padding, rate_idx;
-
- memset(&status, 0, sizeof(status));
-
-@@ -766,16 +766,17 @@ void b43_rx(struct b43_wldev *dev, struc
- }
-
- if (phystat0 & B43_RX_PHYST0_OFDM)
-- status.rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,
-+ rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,
- phytype == B43_PHYTYPE_A);
- else
-- status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);
-- if (unlikely(status.rate_idx == -1)) {
-+ rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);
-+ if (unlikely(rate_idx == -1)) {
- /* PLCP seems to be corrupted.
- * Drop the frame, if we are not interested in corrupted frames. */
- if (!(dev->wl->filter_flags & FIF_PLCPFAIL))
- goto drop;
- }
-+ status.rate_idx = rate_idx;
- status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT);
-
- /*
---- a/drivers/net/wireless/libertas/cfg.c
-+++ b/drivers/net/wireless/libertas/cfg.c
-@@ -2182,13 +2182,15 @@ int lbs_reg_notifier(struct wiphy *wiphy
- struct regulatory_request *request)
- {
- struct lbs_private *priv = wiphy_priv(wiphy);
-- int ret;
-+ int ret = 0;
-
- lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "
- "callback for domain %c%c\n", request->alpha2[0],
- request->alpha2[1]);
-
-- ret = lbs_set_11d_domain_info(priv, request, wiphy->bands);
-+ memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
-+ if (lbs_iface_active(priv))
-+ ret = lbs_set_11d_domain_info(priv);
-
- lbs_deb_leave(LBS_DEB_CFG80211);
- return ret;
---- a/drivers/net/wireless/libertas/cmd.c
-+++ b/drivers/net/wireless/libertas/cmd.c
-@@ -733,15 +733,13 @@ int lbs_get_rssi(struct lbs_private *pri
- * to the firmware
- *
- * @priv: pointer to &struct lbs_private
-- * @request: cfg80211 regulatory request structure
-- * @bands: the device's supported bands and channels
- *
- * returns: 0 on success, error code on failure
- */
--int lbs_set_11d_domain_info(struct lbs_private *priv,
-- struct regulatory_request *request,
-- struct ieee80211_supported_band **bands)
-+int lbs_set_11d_domain_info(struct lbs_private *priv)
- {
-+ struct wiphy *wiphy = priv->wdev->wiphy;
-+ struct ieee80211_supported_band **bands = wiphy->bands;
- struct cmd_ds_802_11d_domain_info cmd;
- struct mrvl_ie_domain_param_set *domain = &cmd.domain;
- struct ieee80211_country_ie_triplet *t;
-@@ -752,21 +750,23 @@ int lbs_set_11d_domain_info(struct lbs_p
- u8 first_channel = 0, next_chan = 0, max_pwr = 0;
- u8 i, flag = 0;
- size_t triplet_size;
-- int ret;
-+ int ret = 0;
-
- lbs_deb_enter(LBS_DEB_11D);
-+ if (!priv->country_code[0])
-+ goto out;
-
- memset(&cmd, 0, sizeof(cmd));
- cmd.action = cpu_to_le16(CMD_ACT_SET);
-
- lbs_deb_11d("Setting country code '%c%c'\n",
-- request->alpha2[0], request->alpha2[1]);
-+ priv->country_code[0], priv->country_code[1]);
-
- domain->header.type = cpu_to_le16(TLV_TYPE_DOMAIN);
-
- /* Set country code */
-- domain->country_code[0] = request->alpha2[0];
-- domain->country_code[1] = request->alpha2[1];
-+ domain->country_code[0] = priv->country_code[0];
-+ domain->country_code[1] = priv->country_code[1];
- domain->country_code[2] = ' ';
-
- /* Now set up the channel triplets; firmware is somewhat picky here
-@@ -848,6 +848,7 @@ int lbs_set_11d_domain_info(struct lbs_p
-
- ret = lbs_cmd_with_response(priv, CMD_802_11D_DOMAIN_INFO, &cmd);
-
-+out:
- lbs_deb_leave_args(LBS_DEB_11D, "ret %d", ret);
- return ret;
- }
-@@ -1019,9 +1020,9 @@ static void lbs_submit_command(struct lb
- if (ret) {
- netdev_info(priv->dev, "DNLD_CMD: hw_host_to_card failed: %d\n",
- ret);
-- /* Let the timer kick in and retry, and potentially reset
-- the whole thing if the condition persists */
-- timeo = HZ/4;
-+ /* Reset dnld state machine, report failure */
-+ priv->dnld_sent = DNLD_RES_RECEIVED;
-+ lbs_complete_command(priv, cmdnode, ret);
- }
-
- if (command == CMD_802_11_DEEP_SLEEP) {
---- a/drivers/net/wireless/libertas/cmd.h
-+++ b/drivers/net/wireless/libertas/cmd.h
-@@ -128,9 +128,7 @@ int lbs_set_monitor_mode(struct lbs_priv
-
- int lbs_get_rssi(struct lbs_private *priv, s8 *snr, s8 *nf);
-
--int lbs_set_11d_domain_info(struct lbs_private *priv,
-- struct regulatory_request *request,
-- struct ieee80211_supported_band **bands);
-+int lbs_set_11d_domain_info(struct lbs_private *priv);
-
- int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value);
-
---- a/drivers/net/wireless/libertas/dev.h
-+++ b/drivers/net/wireless/libertas/dev.h
-@@ -49,6 +49,7 @@ struct lbs_private {
- bool wiphy_registered;
- struct cfg80211_scan_request *scan_req;
- u8 assoc_bss[ETH_ALEN];
-+ u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
- u8 disassoc_reason;
-
- /* Mesh */
---- a/drivers/net/wireless/libertas/if_usb.c
-+++ b/drivers/net/wireless/libertas/if_usb.c
-@@ -311,7 +311,6 @@ static void if_usb_disconnect(struct usb
- cardp->surprise_removed = 1;
-
- if (priv) {
-- priv->surpriseremoved = 1;
- lbs_stop_card(priv);
- lbs_remove_card(priv);
- }
---- a/drivers/net/wireless/libertas/main.c
-+++ b/drivers/net/wireless/libertas/main.c
-@@ -154,6 +154,12 @@ int lbs_start_iface(struct lbs_private *
- goto err;
++ if (!success)
++ tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
}
-+ ret = lbs_set_11d_domain_info(priv);
-+ if (ret) {
-+ lbs_deb_net("set 11d domain info failed\n");
-+ goto err;
-+ }
-+
- lbs_update_channel(priv);
-
- priv->iface_running = true;
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -1504,8 +1504,6 @@ struct cfg80211_gtk_rekey_data {
- * interfaces are active this callback should reject the configuration.
- * If no interfaces are active or the device is down, the channel should
- * be stored for when a monitor interface becomes active.
-- * @set_monitor_enabled: Notify driver that there are only monitor
-- * interfaces running.
- *
- * @scan: Request to do a scan. If returning zero, the scan request is given
- * the driver, and will be valid until passed to cfg80211_scan_done().
-@@ -1612,6 +1610,10 @@ struct cfg80211_gtk_rekey_data {
- * @get_et_strings: Ethtool API to get a set of strings to describe stats
- * and perhaps other supported types of ethtool data-sets.
- * See @ethtool_ops.get_strings
+ if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1369,6 +1369,10 @@ struct ieee80211_tx_control {
+ * @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.
++ *
++ * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session
++ * should be tear down once BAR frame will not be acked.
+ *
-+ * @get_channel: Get the current operating channel for the virtual interface.
-+ * For monitor interfaces, it should return %NULL unless there's a single
-+ * current monitoring channel.
*/
- struct cfg80211_ops {
- int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
-@@ -1820,7 +1822,10 @@ struct cfg80211_ops {
- void (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
- u32 sset, u8 *data);
-
-- void (*set_monitor_enabled)(struct wiphy *wiphy, bool enabled);
-+ struct ieee80211_channel *
-+ (*get_channel)(struct wiphy *wiphy,
-+ struct wireless_dev *wdev,
-+ enum nl80211_channel_type *type);
+ enum ieee80211_hw_flags {
+ IEEE80211_HW_HAS_RATE_CONTROL = 1<<0,
+@@ -1397,6 +1401,7 @@ enum ieee80211_hw_flags {
+ IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23,
+ IEEE80211_HW_SCAN_WHILE_IDLE = 1<<24,
+ IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
++ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL = 1<<26,
};
- /*
+ /**
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
sdata->vif.type != NL80211_IFTYPE_ADHOC)
return -EINVAL;
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -2982,14 +2982,14 @@ static int ieee80211_probe_client(struct
- return 0;
- }
-
--static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled)
-+static struct ieee80211_channel *
-+ieee80211_cfg_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
-+ enum nl80211_channel_type *type)
- {
- struct ieee80211_local *local = wiphy_priv(wiphy);
-
-- if (enabled)
-- WARN_ON(ieee80211_add_virtual_monitor(local));
-- else
-- ieee80211_del_virtual_monitor(local);
-+ *type = local->_oper_channel_type;
-+ return local->oper_channel;
- }
-
- #ifdef CONFIG_PM
-@@ -3066,11 +3066,11 @@ struct cfg80211_ops mac80211_config_ops
- .tdls_mgmt = ieee80211_tdls_mgmt,
- .probe_client = ieee80211_probe_client,
- .set_noack_map = ieee80211_set_noack_map,
-- .set_monitor_enabled = ieee80211_set_monitor_enabled,
- #ifdef CONFIG_PM
- .set_wakeup = ieee80211_set_wakeup,
- #endif
- .get_et_sset_count = ieee80211_get_et_sset_count,
- .get_et_stats = ieee80211_get_et_stats,
- .get_et_strings = ieee80211_get_et_strings,
-+ .get_channel = ieee80211_cfg_get_channel,
- };
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+@@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
int res = scnprintf(buf, sizeof(buf),
TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1496,10 +1496,6 @@ int ieee80211_add_srates_ie(struct ieee8
- int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,
- struct sk_buff *skb, bool need_basic);
-
--/* virtual monitor */
--int ieee80211_add_virtual_monitor(struct ieee80211_local *local);
--void ieee80211_del_virtual_monitor(struct ieee80211_local *local);
--
- /* channel management */
- enum ieee80211_chan_mode {
- CHAN_MODE_UNDEFINED,
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -201,6 +201,20 @@ static void __ieee80211_sta_join_ibss(st
+ bss_change |= BSS_CHANGED_BASIC_RATES;
+ bss_change |= BSS_CHANGED_HT;
+ bss_change |= BSS_CHANGED_IBSS;
++
++ /*
++ * In 5 GHz/802.11a, we can always use short slot time.
++ * (IEEE 802.11-2012 18.3.8.7)
++ *
++ * In 2.4GHz, we must always use long slots in IBSS for compatibility
++ * reasons.
++ * (IEEE 802.11-2012 19.4.5)
++ *
++ * HT follows these specifications (IEEE 802.11-2012 20.3.18)
++ */
++ sdata->vif.bss_conf.use_short_slot = chan->band == IEEE80211_BAND_5GHZ;
++ bss_change |= BSS_CHANGED_ERP_SLOT;
++
+ sdata->vif.bss_conf.ibss_joined = true;
+ sdata->vif.bss_conf.ibss_creator = creator;
+ ieee80211_bss_info_change_notify(sdata, bss_change);
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -331,7 +331,7 @@ static void ieee80211_set_default_queues
- sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
- }
-
--int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
-+static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
+@@ -508,9 +508,9 @@ static void ieee80211_del_virtual_monito
+ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
{
- struct ieee80211_sub_if_data *sdata;
- int ret = 0;
-@@ -377,7 +377,7 @@ int ieee80211_add_virtual_monitor(struct
- return ret;
- }
-
--void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
-+static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
- {
- struct ieee80211_sub_if_data *sdata;
-
-@@ -410,7 +410,6 @@ static int ieee80211_do_open(struct net_
- {
- struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
++ struct ieee80211_sub_if_data *ap_sdata;
+ 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;
-@@ -497,6 +496,12 @@ static int ieee80211_do_open(struct net_
- break;
- }
-
-+ if (local->monitors == 0 && local->open_count == 0) {
-+ res = ieee80211_add_virtual_monitor(local);
-+ if (res)
-+ goto err_stop;
+@@ -587,10 +587,14 @@ int ieee80211_do_open(struct wireless_de
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_AP_VLAN:
+ /* no need to tell driver, but set carrier */
+- if (rtnl_dereference(sdata->bss->beacon))
+- netif_carrier_on(dev);
+- else
++ if (!rtnl_dereference(sdata->bss->beacon)) {
+ netif_carrier_off(dev);
++ break;
+ }
+
- /* must be before the call to ieee80211_configure_filter */
- local->monitors++;
- if (local->monitors == 1) {
-@@ -511,6 +516,8 @@ static int ieee80211_do_open(struct net_
++ ap_sdata = get_bss_sdata(sdata);
++ ieee80211_vif_copy_channel(sdata, ap_sdata);
++ netif_carrier_on(dev);
break;
- default:
- if (coming_up) {
-+ ieee80211_del_virtual_monitor(local);
-+
- res = drv_add_interface(local, sdata);
- if (res)
- goto err_stop;
-@@ -548,28 +555,6 @@ static int ieee80211_do_open(struct net_
+ case NL80211_IFTYPE_MONITOR:
+ if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
+@@ -665,30 +669,8 @@ int ieee80211_do_open(struct wireless_de
set_bit(SDATA_STATE_RUNNING, &sdata->state);
- }
-
- rate_control_rate_init(sta);
+- netif_carrier_on(dev);
+- } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
++ if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
+ rcu_assign_pointer(local->p2p_sdata, sdata);
- }
--
+
/*
* set_multicast_list will be invoked by the networking core
- * which will check whether any increments here were done in
-@@ -750,6 +735,7 @@ static void ieee80211_do_stop(struct iee
- if (local->monitors == 0) {
- local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR;
- hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;
-+ ieee80211_del_virtual_monitor(local);
- }
-
- ieee80211_adjust_monitor_flags(sdata, -1);
-@@ -823,6 +809,9 @@ static void ieee80211_do_stop(struct iee
- }
- }
- spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-+
-+ if (local->monitors == local->open_count && local->monitors > 0)
-+ ieee80211_add_virtual_monitor(local);
- }
-
- static int ieee80211_stop(struct net_device *dev)
-@@ -959,6 +948,72 @@ static void ieee80211_if_setup(struct ne
+@@ -844,6 +826,8 @@ static void ieee80211_do_stop(struct iee
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_AP_VLAN:
+ list_del(&sdata->u.vlan.list);
++ netif_carrier_off(sdata->dev);
++ ieee80211_vif_release_channel(sdata);
+ /* no need to tell driver */
+ break;
+ case NL80211_IFTYPE_MONITOR:
+@@ -1072,6 +1056,72 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -1063,6 +1118,9 @@ static void ieee80211_iface_work(struct
+@@ -1176,6 +1226,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/offchannel.c
-+++ b/net/mac80211/offchannel.c
-@@ -324,6 +324,7 @@ void ieee80211_sw_roc_work(struct work_s
- container_of(work, struct ieee80211_roc_work, work.work);
- struct ieee80211_sub_if_data *sdata = roc->sdata;
- struct ieee80211_local *local = sdata->local;
-+ bool started;
-
- mutex_lock(&local->mtx);
-
-@@ -366,9 +367,10 @@ void ieee80211_sw_roc_work(struct work_s
- /* finish this ROC */
- finish:
- list_del(&roc->list);
-+ started = roc->started;
- ieee80211_roc_notify_destroy(roc);
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -378,9 +378,6 @@ ieee80211_rx_monitor(struct ieee80211_lo
+ * the SKB because it has a bad FCS/PLCP checksum.
+ */
-- if (roc->started) {
-+ if (started) {
- drv_flush(local, false);
+- /* room for the radiotap header based on driver features */
+- needed_headroom = ieee80211_rx_radiotap_space(local, status);
+-
+ if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
+ present_fcs_len = FCS_LEN;
- local->tmp_channel = NULL;
-@@ -379,7 +381,7 @@ void ieee80211_sw_roc_work(struct work_s
+@@ -399,6 +396,9 @@ ieee80211_rx_monitor(struct ieee80211_lo
+ return remove_monitor_info(local, origskb);
+ }
- ieee80211_recalc_idle(local);
++ /* room for the radiotap header based on driver features */
++ needed_headroom = ieee80211_rx_radiotap_space(local, status);
++
+ if (should_drop_frame(origskb, present_fcs_len)) {
+ /* only need to expand headroom if necessary */
+ skb = origskb;
+@@ -2333,7 +2333,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+ if (len < IEEE80211_MIN_ACTION_SIZE)
+ return RX_DROP_UNUSABLE;
-- if (roc->started)
-+ if (started)
- ieee80211_start_next_roc(local);
- }
+- if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC)
++ if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC &&
++ mgmt->u.action.category != WLAN_CATEGORY_SELF_PROTECTED)
+ return RX_DROP_UNUSABLE;
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2239,6 +2239,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+ if (!(status->rx_flags & IEEE80211_RX_RA_MATCH))
+@@ -2349,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_ADHOC)
break;
-@@ -2456,14 +2457,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2625,14 +2627,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
break;
case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -2788,10 +2790,16 @@ static int prepare_for_handlers(struct i
+@@ -2957,10 +2960,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
+ return 0;
+
break;
- default:
- /* should never get here */
+ 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_CLEAR_PS_FILT,
WLAN_STA_MFP,
WLAN_STA_BLOCK_BA,
---- a/net/wireless/chan.c
-+++ b/net/wireless/chan.c
-@@ -82,7 +82,6 @@ int cfg80211_set_monitor_channel(struct
- int freq, enum nl80211_channel_type chantype)
- {
- struct ieee80211_channel *chan;
-- int err;
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -502,7 +502,11 @@ void ieee80211_tx_status(struct ieee8021
+ IEEE80211_BAR_CTRL_TID_INFO_MASK) >>
+ IEEE80211_BAR_CTRL_TID_INFO_SHIFT;
+
+- ieee80211_set_bar_pending(sta, tid, ssn);
++ if (local->hw.flags &
++ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL)
++ ieee80211_stop_tx_ba_session(&sta->sta, tid);
++ else
++ ieee80211_set_bar_pending(sta, tid, ssn);
+ }
+ }
- if (!rdev->ops->set_monitor_channel)
- return -EOPNOTSUPP;
-@@ -93,13 +92,7 @@ int cfg80211_set_monitor_channel(struct
- if (!chan)
- return -EINVAL;
+--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -534,98 +534,98 @@ static const u32 ar9300_2p2_baseband_cor
+
+ static const u32 ar9300Modes_high_power_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},
++ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 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, 0x12000400, 0x12000400},
+- {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+- {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+- {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+- {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+- {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+- {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+- {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+- {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+- {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+- {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+- {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+- {0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
+- {0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
+- {0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
+- {0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
+- {0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
+- {0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
+- {0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
+- {0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
+- {0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {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, 0x12800400, 0x12800400},
+- {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
+- {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+- {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
+- {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
+- {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
+- {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
+- {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
+- {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
+- {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
+- {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
+- {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
+- {0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
+- {0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
+- {0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
+- {0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
+- {0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
+- {0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
+- {0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
+- {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
+- {0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
++ {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
++ {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
++ {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
++ {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
++ {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
++ {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
++ {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
++ {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
++ {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
++ {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
++ {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
++ {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
++ {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
++ {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
++ {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
++ {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
++ {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
++ {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
++ {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
++ {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
++ {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
++ {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
++ {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
++ {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
++ {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
++ {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
++ {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
++ {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
++ {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
++ {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
++ {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
++ {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
++ {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
++ {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
++ {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
++ {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
++ {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
++ {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
++ {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
++ {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
++ {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
++ {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
++ {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
++ {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
++ {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
++ {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
++ {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
++ {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
++ {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
++ {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
++ {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
++ {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 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},
++ {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
++ {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
++ {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
++ {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
++ {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
++ {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
++ {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
++ {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+- {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+- {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+- {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++ {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+ {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+ {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
+--- a/drivers/net/wireless/ath/ath9k/debug.h
++++ b/drivers/net/wireless/ath/ath9k/debug.h
+@@ -242,7 +242,7 @@ struct ath_rx_stats {
-- err = rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
-- if (!err) {
-- rdev->monitor_channel = chan;
-- rdev->monitor_channel_type = chantype;
-- }
--
-- return err;
-+ return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
+ struct ath_stats {
+ struct ath_interrupt_stats istats;
+- struct ath_tx_stats txstats[IEEE80211_NUM_ACS];
++ struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
+ struct ath_rx_stats rxstats;
+ struct ath_dfs_stats dfs_stats;
+ u32 reset[__RESET_TYPE_MAX];
+--- a/drivers/net/wireless/ath/carl9170/rx.c
++++ b/drivers/net/wireless/ath/carl9170/rx.c
+@@ -684,7 +684,7 @@ static int carl9170_handle_mpdu(struct a
+ if (!skb)
+ return -ENOMEM;
+
+- memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
++ memcpy(IEEE80211_SKB_RXCB(skb), status, sizeof(*status));
+ ieee80211_rx(ar->hw, skb);
+ return 0;
}
+--- a/drivers/net/wireless/ath/ath9k/calib.c
++++ b/drivers/net/wireless/ath/ath9k/calib.c
+@@ -69,6 +69,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw
- void
-@@ -134,9 +127,16 @@ cfg80211_get_chan_state(struct wireless_
- break;
- case NL80211_IFTYPE_AP:
- case NL80211_IFTYPE_P2P_GO:
-+ if (wdev->beacon_interval) {
-+ *chan = wdev->channel;
-+ *chanmode = CHAN_MODE_SHARED;
-+ }
-+ return;
- case NL80211_IFTYPE_MESH_POINT:
-- *chan = wdev->channel;
-- *chanmode = CHAN_MODE_SHARED;
-+ if (wdev->mesh_id_len) {
-+ *chan = wdev->channel;
-+ *chanmode = CHAN_MODE_SHARED;
-+ }
+ if (chan && chan->noisefloor) {
+ s8 delta = chan->noisefloor -
++ ATH9K_NF_CAL_NOISE_THRESH -
+ ath9k_hw_get_default_nf(ah, chan);
+ if (delta > 0)
+ noise += delta;
+--- a/drivers/net/wireless/ath/ath9k/calib.h
++++ b/drivers/net/wireless/ath/ath9k/calib.h
+@@ -21,6 +21,9 @@
+
+ #define AR_PHY_CCA_FILTERWINDOW_LENGTH 5
+
++/* Internal noise floor can vary by about 6db depending on the frequency */
++#define ATH9K_NF_CAL_NOISE_THRESH 6
++
+ #define NUM_NF_READINGS 6
+ #define ATH9K_NF_CAL_HIST_MAX 5
+
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -851,7 +851,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah
return;
- case NL80211_IFTYPE_MONITOR:
- case NL80211_IFTYPE_AP_VLAN:
---- a/net/wireless/core.c
-+++ b/net/wireless/core.c
-@@ -747,60 +747,14 @@ static struct device_type wiphy_type = {
- };
- #endif
+ dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
+ DMA_TO_DEVICE);
+- dev_kfree_skb_any(bf->skb);
++ ieee80211_free_txskb(ah->hw, bf->skb);
+ bf->skb = NULL;
+ bf->skbaddr = 0;
+ bf->desc->ds_data = 0;
+@@ -1578,7 +1578,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw,
+ return;
+
+ drop_packet:
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(hw, skb);
+ }
+
+ static void
+--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+@@ -65,7 +65,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct
+ u16 qnum = skb_get_queue_mapping(skb);
--static struct ieee80211_channel *
--cfg80211_get_any_chan(struct cfg80211_registered_device *rdev)
--{
-- struct ieee80211_supported_band *sband;
-- int i;
--
-- for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
-- sband = rdev->wiphy.bands[i];
-- if (sband && sband->n_channels > 0)
-- return &sband->channels[0];
-- }
--
-- return NULL;
--}
--
--static void cfg80211_init_mon_chan(struct cfg80211_registered_device *rdev)
--{
-- struct ieee80211_channel *chan;
--
-- chan = cfg80211_get_any_chan(rdev);
-- if (WARN_ON(!chan))
-- return;
--
-- mutex_lock(&rdev->devlist_mtx);
-- WARN_ON(cfg80211_set_monitor_channel(rdev, chan->center_freq,
-- NL80211_CHAN_NO_HT));
-- mutex_unlock(&rdev->devlist_mtx);
--}
--
- void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
- enum nl80211_iftype iftype, int num)
- {
-- bool has_monitors_only_old = cfg80211_has_monitors_only(rdev);
-- bool has_monitors_only_new;
--
- ASSERT_RTNL();
+ if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(hw, skb);
+ return;
+ }
- rdev->num_running_ifaces += num;
- if (iftype == NL80211_IFTYPE_MONITOR)
- rdev->num_running_monitor_ifaces += num;
--
-- has_monitors_only_new = cfg80211_has_monitors_only(rdev);
-- if (has_monitors_only_new != has_monitors_only_old) {
-- if (rdev->ops->set_monitor_enabled)
-- rdev->ops->set_monitor_enabled(&rdev->wiphy,
-- has_monitors_only_new);
--
-- if (!has_monitors_only_new) {
-- rdev->monitor_channel = NULL;
-- rdev->monitor_channel_type = NL80211_CHAN_NO_HT;
-- } else {
-- cfg80211_init_mon_chan(rdev);
-- }
-- }
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c
+@@ -409,7 +409,10 @@ static inline
+ struct b43_dmadesc_meta *meta)
+ {
+ if (meta->skb) {
+- dev_kfree_skb_any(meta->skb);
++ if (ring->tx)
++ ieee80211_free_txskb(ring->dev->wl->hw, meta->skb);
++ else
++ dev_kfree_skb_any(meta->skb);
+ meta->skb = NULL;
+ }
}
-
- static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
-@@ -932,6 +886,7 @@ static int cfg80211_netdev_notifier_call
- mutex_unlock(&rdev->devlist_mtx);
- dev_put(dev);
- }
-+ cfg80211_update_iface_num(rdev, wdev->iftype, 1);
- cfg80211_lock_rdev(rdev);
- mutex_lock(&rdev->devlist_mtx);
- wdev_lock(wdev);
-@@ -1026,7 +981,6 @@ static int cfg80211_netdev_notifier_call
- mutex_unlock(&rdev->devlist_mtx);
- if (ret)
- return notifier_from_errno(ret);
-- cfg80211_update_iface_num(rdev, wdev->iftype, 1);
- break;
+@@ -1454,7 +1457,7 @@ int b43_dma_tx(struct b43_wldev *dev, st
+ if (unlikely(err == -ENOKEY)) {
+ /* Drop this packet, as we don't have the encryption key
+ * anymore and must not transmit it unencrypted. */
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(dev->wl->hw, skb);
+ err = 0;
+ goto out;
}
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -3397,7 +3397,7 @@ static void b43_tx_work(struct work_stru
+ break;
+ }
+ if (unlikely(err))
+- dev_kfree_skb(skb); /* Drop it */
++ ieee80211_free_txskb(wl->hw, skb);
+ err = 0;
+ }
---- a/net/wireless/core.h
-+++ b/net/wireless/core.h
-@@ -61,9 +61,6 @@ struct cfg80211_registered_device {
- int num_running_ifaces;
- int num_running_monitor_ifaces;
+@@ -3419,7 +3419,7 @@ static void b43_op_tx(struct ieee80211_h
-- struct ieee80211_channel *monitor_channel;
-- enum nl80211_channel_type monitor_channel_type;
--
- /* BSSes/scanning */
- spinlock_t bss_lock;
- struct list_head bss_list;
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -1759,11 +1759,17 @@ static int nl80211_send_iface(struct sk_
- (cfg80211_rdev_list_generation << 2)))
- goto nla_put_failure;
+ if (unlikely(skb->len < 2 + 2 + 6)) {
+ /* Too short, this can't be a valid frame. */
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(hw, skb);
+ return;
+ }
+ B43_WARN_ON(skb_shinfo(skb)->nr_frags);
+@@ -4234,8 +4234,12 @@ redo:
-- if (rdev->monitor_channel) {
-- if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
-- rdev->monitor_channel->center_freq) ||
-- nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-- rdev->monitor_channel_type))
-+ if (rdev->ops->get_channel) {
-+ struct ieee80211_channel *chan;
-+ enum nl80211_channel_type channel_type;
+ /* Drain all TX queues. */
+ for (queue_num = 0; queue_num < B43_QOS_QUEUE_NUM; queue_num++) {
+- while (skb_queue_len(&wl->tx_queue[queue_num]))
+- dev_kfree_skb(skb_dequeue(&wl->tx_queue[queue_num]));
++ while (skb_queue_len(&wl->tx_queue[queue_num])) {
++ struct sk_buff *skb;
+
-+ chan = rdev->ops->get_channel(&rdev->wiphy, wdev,
-+ &channel_type);
-+ if (chan &&
-+ (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
-+ chan->center_freq) ||
-+ nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-+ channel_type)))
- goto nla_put_failure;
++ skb = skb_dequeue(&wl->tx_queue[queue_num]);
++ ieee80211_free_txskb(wl->hw, skb);
++ }
}
---- a/net/wireless/wext-compat.c
-+++ b/net/wireless/wext-compat.c
-@@ -827,6 +827,8 @@ static int cfg80211_wext_giwfreq(struct
- {
- struct wireless_dev *wdev = dev->ieee80211_ptr;
- struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
-+ struct ieee80211_channel *chan;
-+ enum nl80211_channel_type channel_type;
+ b43_mac_suspend(dev);
+--- a/drivers/net/wireless/b43/pio.c
++++ b/drivers/net/wireless/b43/pio.c
+@@ -196,7 +196,7 @@ static void b43_pio_cancel_tx_packets(st
+ for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
+ pack = &(q->packets[i]);
+ if (pack->skb) {
+- dev_kfree_skb_any(pack->skb);
++ ieee80211_free_txskb(q->dev->wl->hw, pack->skb);
+ pack->skb = NULL;
+ }
+ }
+@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, st
+ if (unlikely(err == -ENOKEY)) {
+ /* Drop this packet, as we don't have the encryption key
+ * anymore and must not transmit it unencrypted. */
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(dev->wl->hw, skb);
+ err = 0;
+ goto out;
+ }
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -915,6 +915,12 @@ static int ieee80211_start_ap(struct wip
+ if (err)
+ return err;
+
++ list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
++ err = ieee80211_vif_copy_channel(vlan, sdata);
++ if (err)
++ return err;
++ }
++
+ /*
+ * Apply control port protocol, this allows us to
+ * not encrypt dynamic WEP control frames.
+@@ -998,8 +1004,11 @@ static int ieee80211_stop_ap(struct wiph
+ old_probe_resp = rtnl_dereference(sdata->u.ap.probe_resp);
+
+ /* turn off carrier for this interface and dependent VLANs */
+- list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
++ list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
++ sta_info_flush(local, vlan);
+ netif_carrier_off(vlan->dev);
++ ieee80211_vif_release_channel(vlan);
++ }
+ netif_carrier_off(dev);
+
+ /* remove beacon and probe response */
+--- a/net/mac80211/chan.c
++++ b/net/mac80211/chan.c
+@@ -119,14 +119,17 @@ static int ieee80211_assign_vif_chanctx(
+
+ lockdep_assert_held(&local->chanctx_mtx);
+
+- ret = drv_assign_vif_chanctx(local, sdata, ctx);
+- if (ret)
+- return ret;
++ if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN) {
++ ret = drv_assign_vif_chanctx(local, sdata, ctx);
++ if (ret)
++ return ret;
++ }
- switch (wdev->iftype) {
- case NL80211_IFTYPE_STATION:
-@@ -834,10 +836,13 @@ static int cfg80211_wext_giwfreq(struct
- case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
- case NL80211_IFTYPE_MONITOR:
-- if (!rdev->monitor_channel)
-+ if (!rdev->ops->get_channel)
- return -EINVAL;
+ rcu_assign_pointer(sdata->vif.chanctx_conf, &ctx->conf);
+ ctx->refcount++;
+
+- ieee80211_recalc_txpower(sdata);
++ if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
++ ieee80211_recalc_txpower(sdata);
+
+ return 0;
+ }
+@@ -174,7 +177,8 @@ static void ieee80211_unassign_vif_chanc
+ ctx->refcount--;
+ rcu_assign_pointer(sdata->vif.chanctx_conf, NULL);
+
+- drv_unassign_vif_chanctx(local, sdata, ctx);
++ if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
++ drv_unassign_vif_chanctx(local, sdata, ctx);
+
+ if (ctx->refcount > 0) {
+ ieee80211_recalc_chanctx_chantype(sdata->local, ctx);
+@@ -285,6 +289,30 @@ void ieee80211_recalc_smps_chanctx(struc
+ drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RX_CHAINS);
+ }
-- freq->m = rdev->monitor_channel->center_freq;
-+ chan = rdev->ops->get_channel(wdev->wiphy, wdev, &channel_type);
-+ if (!chan)
-+ return -EINVAL;
-+ freq->m = chan->center_freq;
- freq->e = 6;
- return 0;
- default:
++int ieee80211_vif_copy_channel(struct ieee80211_sub_if_data *sdata,
++ struct ieee80211_sub_if_data *parent)
++{
++ struct ieee80211_local *local = sdata->local;
++ struct ieee80211_chanctx_conf *conf;
++ struct ieee80211_chanctx *ctx;
++
++ int ret;
++
++ mutex_lock(&local->chanctx_mtx);
++ conf = rcu_dereference_protected(parent->vif.chanctx_conf,
++ lockdep_is_held(&local->chanctx_mtx));
++ if (!conf) {
++ ret = -ENOENT;
++ goto out;
++ }
++
++ ctx = container_of(conf, struct ieee80211_chanctx, conf);
++ ret = ieee80211_assign_vif_chanctx(sdata, ctx);
++out:
++ mutex_unlock(&local->chanctx_mtx);
++ return ret;
++}
++
+ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
+ const struct cfg80211_chan_def *chandef,
+ enum ieee80211_chanctx_mode mode)
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1633,6 +1633,8 @@ ieee80211_vif_use_channel(struct ieee802
+ const struct cfg80211_chan_def *chandef,
+ enum ieee80211_chanctx_mode mode);
+ void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata);
++int ieee80211_vif_copy_channel(struct ieee80211_sub_if_data *sdata,
++ struct ieee80211_sub_if_data *parent);
+
+ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
+ struct ieee80211_chanctx *chanctx);
projects / openwrt / svn-archive / archive.git / blobdiff