X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F300-pending_work.patch;h=0ffa61d4dc77425d6718b52e78d0cb276e164b70;hb=7c38b4974d5ef1b0b73692410e35f19cdc0ed10d;hp=285ce6944975376c3cada3c77583056f1d6d3b82;hpb=2b0a8f51d197f2803ec11c34e4441dbfe9122247;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 285ce69449..0ffa61d4dc 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,71 +1,595 @@
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -2416,6 +2416,22 @@ ath5k_tx_complete_poll_work(struct work_
+ * Initialization routines *
+ \*************************/
+ 
++static const struct ieee80211_iface_limit if_limits[] = {
++	{ .max = 2048,	.types = BIT(NL80211_IFTYPE_STATION) },
++	{ .max = 4,	.types =
++#ifdef CONFIG_MAC80211_MESH
++				 BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
++				 BIT(NL80211_IFTYPE_AP) },
++};
++
++static const struct ieee80211_iface_combination if_comb = {
++	.limits = if_limits,
++	.n_limits = ARRAY_SIZE(if_limits),
++	.max_interfaces = 2048,
++	.num_different_channels = 1,
++};
++
+ int __devinit
+ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
+ {
+@@ -2437,6 +2453,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const
+ 		BIT(NL80211_IFTYPE_ADHOC) |
+ 		BIT(NL80211_IFTYPE_MESH_POINT);
+ 
++	hw->wiphy->iface_combinations = &if_comb;
++	hw->wiphy->n_iface_combinations = 1;
++
+ 	/* SW support for IBSS_RSN is provided by mac80211 */
+ 	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+ 
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -618,19 +618,10 @@ static void ar5008_hw_init_bb(struct ath
+ 	u32 synthDelay;
+ 
+ 	synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(chan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+-
+-	if (IS_CHAN_HALF_RATE(chan))
+-		synthDelay *= 2;
+-	else if (IS_CHAN_QUARTER_RATE(chan))
+-		synthDelay *= 4;
+ 
+ 	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+ 
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, chan, synthDelay);
+ }
+ 
+ static void ar5008_hw_init_chain_masks(struct ath_hw *ah)
+@@ -868,7 +859,7 @@ static int ar5008_hw_process_ini(struct 
+ 	ar5008_hw_set_channel_regs(ah, chan);
+ 	ar5008_hw_init_chain_masks(ah);
+ 	ath9k_olc_init(ah);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 
+ 	/* Write analog registers */
+ 	if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) {
+@@ -948,12 +939,8 @@ static bool ar5008_hw_rfbus_req(struct a
+ static void ar5008_hw_rfbus_done(struct ath_hw *ah)
+ {
+ 	u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(ah->curchan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
+ 
+ 	REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -1000,10 +1000,12 @@ static bool ar9003_hw_init_cal(struct at
+ 	if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+ 		ar9003_mci_init_cal_req(ah, &is_reusable);
+ 
+-	txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
+-	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
+-	udelay(5);
+-	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
++	if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
++		txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
++		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
++		udelay(5);
++		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
++	}
+ 
+ skip_tx_iqcal:
+ 	if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+@@ -4281,18 +4281,10 @@ static int ar9003_hw_tx_power_regwrite(s
+ #undef POW_SM
+ }
+ 
+-static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
+-					      u8 *targetPowerValT2)
++static void ar9003_hw_get_legacy_target_powers(struct ath_hw *ah, u16 freq,
++					       u8 *targetPowerValT2,
++					       bool is2GHz)
+ {
+-	/* XXX: hard code for now, need to get from eeprom struct */
+-	u8 ht40PowerIncForPdadc = 0;
+-	bool is2GHz = false;
+-	unsigned int i = 0;
+-	struct ath_common *common = ath9k_hw_common(ah);
+-
+-	if (freq < 4000)
+-		is2GHz = true;
+-
+ 	targetPowerValT2[ALL_TARGET_LEGACY_6_24] =
+ 	    ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_6_24, freq,
+ 					 is2GHz);
+@@ -4305,6 +4297,11 @@ static void ar9003_hw_set_target_power_e
+ 	targetPowerValT2[ALL_TARGET_LEGACY_54] =
+ 	    ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_54, freq,
+ 					 is2GHz);
++}
++
++static void ar9003_hw_get_cck_target_powers(struct ath_hw *ah, u16 freq,
++					    u8 *targetPowerValT2)
++{
+ 	targetPowerValT2[ALL_TARGET_LEGACY_1L_5L] =
+ 	    ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_1L_5L,
+ 					     freq);
+@@ -4314,6 +4311,11 @@ static void ar9003_hw_set_target_power_e
+ 	    ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11L, freq);
+ 	targetPowerValT2[ALL_TARGET_LEGACY_11S] =
+ 	    ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11S, freq);
++}
++
++static void ar9003_hw_get_ht20_target_powers(struct ath_hw *ah, u16 freq,
++					     u8 *targetPowerValT2, bool is2GHz)
++{
+ 	targetPowerValT2[ALL_TARGET_HT20_0_8_16] =
+ 	    ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq,
+ 					      is2GHz);
+@@ -4356,6 +4358,16 @@ static void ar9003_hw_set_target_power_e
+ 	targetPowerValT2[ALL_TARGET_HT20_23] =
+ 	    ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_23, freq,
+ 					      is2GHz);
++}
++
++static void ar9003_hw_get_ht40_target_powers(struct ath_hw *ah,
++						   u16 freq,
++						   u8 *targetPowerValT2,
++						   bool is2GHz)
++{
++	/* XXX: hard code for now, need to get from eeprom struct */
++	u8 ht40PowerIncForPdadc = 0;
++
+ 	targetPowerValT2[ALL_TARGET_HT40_0_8_16] =
+ 	    ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq,
+ 					      is2GHz) + ht40PowerIncForPdadc;
+@@ -4399,6 +4411,26 @@ static void ar9003_hw_set_target_power_e
+ 	targetPowerValT2[ALL_TARGET_HT40_23] =
+ 	    ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_23, freq,
+ 					      is2GHz) + ht40PowerIncForPdadc;
++}
++
++static void ar9003_hw_get_target_power_eeprom(struct ath_hw *ah,
++					      struct ath9k_channel *chan,
++					      u8 *targetPowerValT2)
++{
++	bool is2GHz = IS_CHAN_2GHZ(chan);
++	unsigned int i = 0;
++	struct ath_common *common = ath9k_hw_common(ah);
++	u16 freq = chan->channel;
++
++	if (is2GHz)
++		ar9003_hw_get_cck_target_powers(ah, freq, targetPowerValT2);
++
++	ar9003_hw_get_legacy_target_powers(ah, freq, targetPowerValT2, is2GHz);
++	ar9003_hw_get_ht20_target_powers(ah, freq, targetPowerValT2, is2GHz);
++
++	if (IS_CHAN_HT40(chan))
++		ar9003_hw_get_ht40_target_powers(ah, freq, targetPowerValT2,
++						 is2GHz);
+ 
+ 	for (i = 0; i < ar9300RateSize; i++) {
+ 		ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",
+@@ -4778,9 +4810,6 @@ static void ar9003_hw_set_power_per_rate
+ 	scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit,
+ 						antenna_reduction);
+ 
+-	/*
+-	 * Get target powers from EEPROM - our baseline for TX Power
+-	 */
+ 	if (is2ghz) {
+ 		/* Setup for CTL modes */
+ 		/* CTL_11B, CTL_11G, CTL_2GHT20 */
+@@ -4952,7 +4981,12 @@ static void ath9k_hw_ar9300_set_txpower(
+ 	unsigned int i = 0, paprd_scale_factor = 0;
+ 	u8 pwr_idx, min_pwridx = 0;
+ 
+-	ar9003_hw_set_target_power_eeprom(ah, chan->channel, targetPowerValT2);
++	memset(targetPowerValT2, 0 , sizeof(targetPowerValT2));
++
++	/*
++	 * Get target powers from EEPROM - our baseline for TX Power
++	 */
++	ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2);
+ 
+ 	if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) {
+ 		if (IS_CHAN_2GHZ(chan))
+--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -54,7 +54,7 @@ void ar9003_paprd_enable(struct ath_hw *
+ 
+ 	if (val) {
+ 		ah->paprd_table_write_done = true;
+-		ath9k_hw_apply_txpower(ah, chan);
++		ath9k_hw_apply_txpower(ah, chan, false);
+ 	}
+ 
+ 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -526,22 +526,10 @@ static void ar9003_hw_init_bb(struct ath
+ 	 * Value is in 100ns increments.
+ 	 */
+ 	synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(chan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+ 	/* Activate the PHY (includes baseband activate + synthesizer on) */
+ 	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+-
+-	/*
+-	 * There is an issue if the AP starts the calibration before
+-	 * the base band timeout completes.  This could result in the
+-	 * rx_clear false triggering.  As a workaround we add delay an
+-	 * extra BASE_ACTIVATE_DELAY usecs to ensure this condition
+-	 * does not happen.
+-	 */
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, chan, synthDelay);
+ }
+ 
+ static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+@@ -692,7 +680,7 @@ static int ar9003_hw_process_ini(struct 
+ 	ar9003_hw_override_ini(ah);
+ 	ar9003_hw_set_channel_regs(ah, chan);
+ 	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 
+ 	if (AR_SREV_9462(ah)) {
+ 		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
+@@ -723,6 +711,14 @@ static void ar9003_hw_set_rfmode(struct 
+ 
+ 	if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
++	if (IS_CHAN_QUARTER_RATE(chan))
++		rfMode |= AR_PHY_MODE_QUARTER;
++	if (IS_CHAN_HALF_RATE(chan))
++		rfMode |= AR_PHY_MODE_HALF;
++
++	if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
++		REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
++			      AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);
+ 
+ 	REG_WRITE(ah, AR_PHY_MODE, rfMode);
+ }
+@@ -793,12 +789,8 @@ static bool ar9003_hw_rfbus_req(struct a
+ static void ar9003_hw_rfbus_done(struct ath_hw *ah)
+ {
+ 	u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(ah->curchan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
+ 
+ 	REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+@@ -468,6 +468,9 @@
+ #define AR_PHY_ADDAC_PARA_CTL    (AR_SM_BASE + 0x150)
+ #define AR_PHY_XPA_CFG           (AR_SM_BASE + 0x158)
+ 
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW  3
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW_S    0
++
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A           0x0001FC00
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A_S         10
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A                       0x3FF
+--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
++++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+@@ -798,6 +798,8 @@ static void ath9k_hw_ar9287_set_txpower(
+ 			regulatory->max_power_level = ratesArray[i];
+ 	}
+ 
++	ath9k_hw_update_regulatory_maxpower(ah);
++
+ 	if (test)
+ 		return;
+ 
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -191,6 +191,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3
+ }
+ EXPORT_SYMBOL(ath9k_hw_wait);
+ 
++void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
++			  int hw_delay)
++{
++	if (IS_CHAN_B(chan))
++		hw_delay = (4 * hw_delay) / 22;
++	else
++		hw_delay /= 10;
++
++	if (IS_CHAN_HALF_RATE(chan))
++		hw_delay *= 2;
++	else if (IS_CHAN_QUARTER_RATE(chan))
++		hw_delay *= 4;
++
++	udelay(hw_delay + BASE_ACTIVATE_DELAY);
++}
++
+ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+ 			  int column, unsigned int *writecnt)
+ {
+@@ -1020,7 +1036,7 @@ void ath9k_hw_init_global_settings(struc
+ 	struct ath_common *common = ath9k_hw_common(ah);
+ 	struct ieee80211_conf *conf = &common->hw->conf;
+ 	const struct ath9k_channel *chan = ah->curchan;
+-	int acktimeout, ctstimeout;
++	int acktimeout, ctstimeout, ack_offset = 0;
+ 	int slottime;
+ 	int sifstime;
+ 	int rx_lat = 0, tx_lat = 0, eifs = 0;
+@@ -1041,6 +1057,11 @@ void ath9k_hw_init_global_settings(struc
+ 		rx_lat = 37;
+ 	tx_lat = 54;
+ 
++	if (IS_CHAN_5GHZ(chan))
++		sifstime = 16;
++	else
++		sifstime = 10;
++
+ 	if (IS_CHAN_HALF_RATE(chan)) {
+ 		eifs = 175;
+ 		rx_lat *= 2;
+@@ -1048,8 +1069,9 @@ void ath9k_hw_init_global_settings(struc
+ 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		    tx_lat += 11;
+ 
++		sifstime *= 2;
++		ack_offset = 16;
+ 		slottime = 13;
+-		sifstime = 32;
+ 	} else if (IS_CHAN_QUARTER_RATE(chan)) {
+ 		eifs = 340;
+ 		rx_lat = (rx_lat * 4) - 1;
+@@ -1057,8 +1079,9 @@ void ath9k_hw_init_global_settings(struc
+ 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		    tx_lat += 22;
+ 
++		sifstime *= 4;
++		ack_offset = 32;
+ 		slottime = 21;
+-		sifstime = 64;
+ 	} else {
+ 		if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
+ 			eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO;
+@@ -1072,14 +1095,10 @@ void ath9k_hw_init_global_settings(struc
+ 		tx_lat = MS(reg, AR_USEC_TX_LAT);
+ 
+ 		slottime = ah->slottime;
+-		if (IS_CHAN_5GHZ(chan))
+-			sifstime = 16;
+-		else
+-			sifstime = 10;
+ 	}
+ 
+ 	/* As defined by IEEE 802.11-2007 17.3.8.6 */
+-	acktimeout = slottime + sifstime + 3 * ah->coverage_class;
++	acktimeout = slottime + sifstime + 3 * ah->coverage_class + ack_offset;
+ 	ctstimeout = acktimeout;
+ 
+ 	/*
+@@ -1089,7 +1108,8 @@ void ath9k_hw_init_global_settings(struc
+ 	 * BA frames in some implementations, but it has been found to fix ACK
+ 	 * timeout issues in other cases as well.
+ 	 */
+-	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
++	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ &&
++	    !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
+ 		acktimeout += 64 - sifstime - ah->slottime;
+ 		ctstimeout += 48 - sifstime - ah->slottime;
+ 	}
+@@ -1469,6 +1489,10 @@ static bool ath9k_hw_channel_change(stru
+ 						    CHANNEL_5GHZ));
+ 	mode_diff = (chan->chanmode != ah->curchan->chanmode);
+ 
++	if ((ah->curchan->channelFlags | chan->channelFlags) &
++	    (CHANNEL_HALF | CHANNEL_QUARTER))
++		return false;
++
+ 	for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
+ 		if (ath9k_hw_numtxpending(ah, qnum)) {
+ 			ath_dbg(common, QUEUE,
+@@ -1502,7 +1526,7 @@ static bool ath9k_hw_channel_change(stru
+ 		return false;
+ 	}
+ 	ath9k_hw_set_clockrate(ah);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 	ath9k_hw_rfbus_done(ah);
+ 
+ 	if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
+@@ -2773,7 +2797,8 @@ static int get_antenna_gain(struct ath_h
+ 	return ah->eep_ops->get_eeprom(ah, gain_param);
+ }
+ 
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan)
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++			    bool test)
+ {
+ 	struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
+ 	struct ieee80211_channel *channel;
+@@ -2794,7 +2819,7 @@ void ath9k_hw_apply_txpower(struct ath_h
+ 
+ 	ah->eep_ops->set_txpower(ah, chan,
+ 				 ath9k_regd_get_ctl(reg, chan),
+-				 ant_reduction, new_pwr, false);
++				 ant_reduction, new_pwr, test);
+ }
+ 
+ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
+@@ -2807,7 +2832,7 @@ void ath9k_hw_set_txpowerlimit(struct at
+ 	if (test)
+ 		channel->max_power = MAX_RATE_POWER / 2;
+ 
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, test);
+ 
+ 	if (test)
+ 		channel->max_power = DIV_ROUND_UP(reg->max_power_level, 2);
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -923,6 +923,8 @@ void ath9k_hw_set_gpio(struct ath_hw *ah
+ void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
+ 
+ /* General Operation */
++void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
++			  int hw_delay);
+ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
+ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+ 			  int column, unsigned int *writecnt);
+@@ -982,7 +984,8 @@ void ath9k_hw_name(struct ath_hw *ah, ch
+ /* PHY */
+ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
+ 				   u32 *coef_mantissa, u32 *coef_exponent);
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan);
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++			    bool test);
+ 
+ /*
+  * Code Specific to AR5008, AR9001 or AR9002,
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -647,6 +647,24 @@ void ath9k_reload_chainmask_settings(str
+ 		setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
+ }
+ 
++static const struct ieee80211_iface_limit if_limits[] = {
++	{ .max = 2048,	.types = BIT(NL80211_IFTYPE_STATION) |
++				 BIT(NL80211_IFTYPE_P2P_CLIENT) |
++				 BIT(NL80211_IFTYPE_WDS) },
++	{ .max = 8,	.types =
++#ifdef CONFIG_MAC80211_MESH
++				 BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
++				 BIT(NL80211_IFTYPE_AP) |
++				 BIT(NL80211_IFTYPE_P2P_GO) },
++};
++
++static const struct ieee80211_iface_combination if_comb = {
++	.limits = if_limits,
++	.n_limits = ARRAY_SIZE(if_limits),
++	.max_interfaces = 2048,
++	.num_different_channels = 1,
++};
+ 
+ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
+ {
+@@ -676,6 +694,9 @@ void ath9k_set_hw_capab(struct ath_softc
+ 		BIT(NL80211_IFTYPE_ADHOC) |
+ 		BIT(NL80211_IFTYPE_MESH_POINT);
+ 
++	hw->wiphy->iface_combinations = &if_comb;
++	hw->wiphy->n_iface_combinations = 1;
++
+ 	if (AR_SREV_5416(sc->sc_ah))
+ 		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+ 
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel
+ 
+ void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
+ {
++	int maxdelay = 1000;
+ 	int i, q;
+ 
++	if (ah->curchan) {
++		if (IS_CHAN_HALF_RATE(ah->curchan))
++			maxdelay *= 2;
++		else if (IS_CHAN_QUARTER_RATE(ah->curchan))
++			maxdelay *= 4;
++	}
++
+ 	REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M);
+ 
+ 	REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF);
+@@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw
+ 	REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
+ 
+ 	for (q = 0; q < AR_NUM_QCU; q++) {
+-		for (i = 0; i < 1000; i++) {
++		for (i = 0; i < maxdelay; i++) {
+ 			if (i)
+ 				udelay(5);
+ 
 --- a/net/mac80211/agg-rx.c
 +++ b/net/mac80211/agg-rx.c
-@@ -176,6 +176,8 @@ static void ieee80211_send_addba_resp(st
- 		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
- 	else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+@@ -200,6 +200,8 @@ static void ieee80211_send_addba_resp(st
  		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+ 	else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
+ 		memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
 +	else if (sdata->vif.type == NL80211_IFTYPE_WDS)
 +		memcpy(mgmt->bssid, da, ETH_ALEN);
  
  	mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
  					  IEEE80211_STYPE_ACTION);
-@@ -262,7 +264,11 @@ void ieee80211_process_addba_request(str
- 				"%pM on tid %u\n",
- 				mgmt->sa, tid);
- #endif /* CONFIG_MAC80211_HT_DEBUG */
--		goto end;
-+
-+		/* delete existing Rx BA session on the same tid */
-+		___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
-+						WLAN_STATUS_UNSPECIFIED_QOS,
-+						false);
- 	}
- 
- 	/* prepare A-MPDU MLME for Rx aggregation */
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c
-@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
- 	memcpy(mgmt->da, da, ETH_ALEN);
+@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
  	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
  	if (sdata->vif.type == NL80211_IFTYPE_AP ||
--	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-+	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+ 	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+-	    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
++	    sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
 +	    sdata->vif.type == NL80211_IFTYPE_WDS)
  		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
  	else if (sdata->vif.type == NL80211_IFTYPE_STATION)
  		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
- 	 */
- 	if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -484,6 +485,7 @@ int ieee80211_start_tx_ba_session(struct
+ 	    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  	    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
--	    sdata->vif.type != NL80211_IFTYPE_AP)
-+	    sdata->vif.type != NL80211_IFTYPE_AP &&
-+	    sdata->vif.type != NL80211_IFTYPE_WDS)
+ 	    sdata->vif.type != NL80211_IFTYPE_AP &&
++	    sdata->vif.type != NL80211_IFTYPE_WDS &&
+ 	    sdata->vif.type != NL80211_IFTYPE_ADHOC)
  		return -EINVAL;
  
- 	if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
 --- a/net/mac80211/debugfs_sta.c
 +++ b/net/mac80211/debugfs_sta.c
-@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
- 	char buf[100];
- 	struct sta_info *sta = file->private_data;
- 	u32 staflags = get_sta_flags(sta);
--	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
-+	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
- 		staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
- 		staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
- 		staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
-@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
- 		staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
- 		staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
- 		staflags & WLAN_STA_WME ? "WME\n" : "",
--		staflags & WLAN_STA_WDS ? "WDS\n" : "",
- 		staflags & WLAN_STA_MFP ? "MFP\n" : "");
- 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
- }
+@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+ 	test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
+ 
+ 	int res = scnprintf(buf, sizeof(buf),
+-			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ 			    TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
+ 			    TEST(PS_DRIVER), TEST(AUTHORIZED),
+ 			    TEST(SHORT_PREAMBLE),
+-			    TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
++			    TEST(WME), TEST(CLEAR_PS_FILT),
+ 			    TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
+ 			    TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
+ 			    TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
+@@ -282,7 +282,6 @@ static int ieee80211_do_open(struct net_
  {
  	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
  	struct ieee80211_local *local = sdata->local;
@@ -73,7 +597,7 @@
  	u32 changed = 0;
  	int res;
  	u32 hw_reconf_flags = 0;
-@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+@@ -428,28 +427,6 @@ static int ieee80211_do_open(struct net_
  
  	set_bit(SDATA_STATE_RUNNING, &sdata->state);
  
@@ -86,8 +610,9 @@
 -			goto err_del_interface;
 -		}
 -
--		/* no locking required since STA is not live yet */
--		sta->flags |= WLAN_STA_AUTHORIZED;
+-		sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+-		sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+-		sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 -
 -		res = sta_info_insert(sta);
 -		if (res) {
@@ -101,17 +626,7 @@
  	/*
  	 * set_multicast_list will be invoked by the networking core
  	 * which will check whether any increments here were done in
-@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
- 	netif_tx_start_all_queues(dev);
- 
- 	return 0;
-- err_del_interface:
--	drv_remove_interface(local, &sdata->vif);
-+
-  err_stop:
- 	if (!local->open_count)
- 		drv_stop(local);
-@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+@@ -846,6 +823,72 @@ static void ieee80211_if_setup(struct ne
  	dev->destructor = free_netdev;
  }
  
@@ -144,7 +659,7 @@
 +	ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
 +			       skb->len - baselen, &elems);
 +
-+	rates = ieee80211_sta_get_rates(local, &elems, band);
++	rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
 +
 +	rcu_read_lock();
 +
@@ -164,14 +679,16 @@
 +	sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 +
 +	if (elems.ht_cap_elem)
-+		ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++		ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
 +				elems.ht_cap_elem, &sta->sta.ht_cap);
 +
 +	if (elems.wmm_param)
-+		set_sta_flags(sta, WLAN_STA_WME);
++		set_sta_flag(sta, WLAN_STA_WME);
 +
 +	if (new) {
-+		sta->flags = WLAN_STA_AUTHORIZED;
++		sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
++		sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
++		sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 +		rate_control_rate_init(sta);
 +		sta_info_insert_rcu(sta);
 +	}
@@ -182,7 +699,7 @@
  static void ieee80211_iface_work(struct work_struct *work)
  {
  	struct ieee80211_sub_if_data *sdata =
-@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct 
+@@ -950,6 +993,9 @@ static void ieee80211_iface_work(struct 
  				break;
  			ieee80211_mesh_rx_queued_mgmt(sdata, skb);
  			break;
@@ -194,17 +711,15 @@
  			break;
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -2137,7 +2137,8 @@ ieee80211_rx_h_action(struct ieee80211_r
- 		 */
- 		if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -2283,6 +2283,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+ 		    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
--		    sdata->vif.type != NL80211_IFTYPE_AP)
-+		    sdata->vif.type != NL80211_IFTYPE_AP &&
-+		    sdata->vif.type != NL80211_IFTYPE_WDS)
+ 		    sdata->vif.type != NL80211_IFTYPE_AP &&
++		    sdata->vif.type != NL80211_IFTYPE_WDS &&
+ 		    sdata->vif.type != NL80211_IFTYPE_ADHOC)
  			break;
  
- 		/* verify action_code is present */
-@@ -2335,13 +2336,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2497,14 +2498,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
  
  	if (!ieee80211_vif_is_mesh(&sdata->vif) &&
  	    sdata->vif.type != NL80211_IFTYPE_ADHOC &&
@@ -214,14 +729,15 @@
  		return RX_DROP_MONITOR;
  
  	switch (stype) {
+ 	case cpu_to_le16(IEEE80211_STYPE_AUTH):
  	case cpu_to_le16(IEEE80211_STYPE_BEACON):
  	case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
 -		/* process for all: mesh, mlme, ibss */
 +		/* process for all: mesh, mlme, ibss, wds */
  		break;
- 	case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
- 	case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-@@ -2680,10 +2682,16 @@ static int prepare_for_handlers(struct i
+ 	case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+ 	case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+@@ -2838,10 +2840,16 @@ static int prepare_for_handlers(struct i
  		}
  		break;
  	case NL80211_IFTYPE_WDS:
@@ -242,242 +758,131 @@
  		/* should never get here */
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
+  * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
   *	frames.
-  * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
   * @WLAN_STA_WME: Station is a QoS-STA.
 - * @WLAN_STA_WDS: Station is one of our WDS peers.
   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
   *	IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
   *	frame to this station is transmitted.
-@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
- 	WLAN_STA_SHORT_PREAMBLE	= 1<<4,
- 	WLAN_STA_ASSOC_AP	= 1<<5,
- 	WLAN_STA_WME		= 1<<6,
--	WLAN_STA_WDS		= 1<<7,
- 	WLAN_STA_CLEAR_PS_FILT	= 1<<9,
- 	WLAN_STA_MFP		= 1<<10,
- 	WLAN_STA_BLOCK_BA	= 1<<11,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -384,7 +384,9 @@ void ath_beacon_tasklet(unsigned long da
- 			ath_dbg(common, ATH_DBG_BSTUCK,
- 				"beacon is officially stuck\n");
- 			sc->sc_flags |= SC_OP_TSF_RESET;
-+			spin_lock(&sc->sc_pcu_lock);
- 			ath_reset(sc, true);
-+			spin_unlock(&sc->sc_pcu_lock);
- 		}
- 
- 		return;
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -617,8 +617,11 @@ void ath_hw_check(struct work_struct *wo
- 	ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
- 		"busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
- 	if (busy >= 99) {
--		if (++sc->hw_busy_count >= 3)
-+		if (++sc->hw_busy_count >= 3) {
-+			spin_lock_bh(&sc->sc_pcu_lock);
- 			ath_reset(sc, true);
-+			spin_unlock_bh(&sc->sc_pcu_lock);
-+		}
- 	} else if (busy >= 0)
- 		sc->hw_busy_count = 0;
- 
-@@ -637,7 +640,9 @@ static void ath_hw_pll_rx_hang_check(str
- 			/* Rx is hung for more than 500ms. Reset it */
- 			ath_dbg(common, ATH_DBG_RESET,
- 				"Possible RX hang, resetting");
-+			spin_lock_bh(&sc->sc_pcu_lock);
- 			ath_reset(sc, true);
-+			spin_unlock_bh(&sc->sc_pcu_lock);
- 			count = 0;
+@@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
+ 	WLAN_STA_AUTHORIZED,
+ 	WLAN_STA_SHORT_PREAMBLE,
+ 	WLAN_STA_WME,
+-	WLAN_STA_WDS,
+ 	WLAN_STA_CLEAR_PS_FILT,
+ 	WLAN_STA_MFP,
+ 	WLAN_STA_BLOCK_BA,
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
+@@ -425,6 +425,7 @@ void iwl_testmode_cleanup(struct iwl_pri
+ #ifdef CONFIG_IWLWIFI_DEBUG
+ void iwl_print_rx_config_cmd(struct iwl_priv *priv,
+ 			     enum iwl_rxon_context_id ctxid);
++int iwl_alloc_traffic_mem(struct iwl_priv *priv);
+ #else
+ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,
+ 					   enum iwl_rxon_context_id ctxid)
+@@ -510,7 +511,6 @@ void iwl_setup_deferred_work(struct iwl_
+ int iwl_send_wimax_coex(struct iwl_priv *priv);
+ int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
+ void iwl_debug_config(struct iwl_priv *priv);
+-int iwl_alloc_traffic_mem(struct iwl_priv *priv);
+ void iwl_set_hw_params(struct iwl_priv *priv);
+ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
+ int iwl_init_drv(struct iwl_priv *priv);
+--- a/drivers/net/wireless/libertas/firmware.c
++++ b/drivers/net/wireless/libertas/firmware.c
+@@ -5,6 +5,7 @@
+ #include <linux/firmware.h>
+ #include <linux/firmware.h>
+ #include <linux/module.h>
++#include <linux/sched.h>
+ 
+ #include "dev.h"
+ #include "decl.h"
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -812,6 +812,7 @@ static bool ath9k_rx_accept(struct ath_c
+ 	is_valid_tkip = rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID &&
+ 		test_bit(rx_stats->rs_keyix, common->tkip_keymap);
+ 	strip_mic = is_valid_tkip && ieee80211_is_data(fc) &&
++		ieee80211_has_protected(fc) &&
+ 		!(rx_stats->rs_status &
+ 		(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
+ 		 ATH9K_RXERR_KEYMISS));
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1023,6 +1023,10 @@ static int ieee80211_change_station(stru
  		}
- 	} else
-@@ -674,7 +679,9 @@ void ath9k_tasklet(unsigned long data)
- 
- 	if ((status & ATH9K_INT_FATAL) ||
- 	    (status & ATH9K_INT_BB_WATCHDOG)) {
-+		spin_lock(&sc->sc_pcu_lock);
- 		ath_reset(sc, true);
-+		spin_unlock(&sc->sc_pcu_lock);
- 		return;
- 	}
- 
-@@ -980,7 +987,6 @@ int ath_reset(struct ath_softc *sc, bool
- 	del_timer_sync(&common->ani.timer);
- 
- 	ath9k_ps_wakeup(sc);
--	spin_lock_bh(&sc->sc_pcu_lock);
- 
- 	ieee80211_stop_queues(hw);
  
-@@ -1023,7 +1029,6 @@ int ath_reset(struct ath_softc *sc, bool
+ 		sta->sdata = vlansdata;
++
++		if (sta->sta_state == IEEE80211_STA_AUTHORIZED)
++			atomic_dec(&sta->sdata->u.ap.num_mcast_sta);
++
+ 		ieee80211_send_layer2_update(sta);
  	}
  
- 	ieee80211_wake_queues(hw);
--	spin_unlock_bh(&sc->sc_pcu_lock);
- 
- 	/* Start ANI */
- 	if (!common->disable_ani)
-@@ -2326,9 +2331,9 @@ static void ath9k_flush(struct ieee80211
- 	ath9k_ps_wakeup(sc);
- 	spin_lock_bh(&sc->sc_pcu_lock);
- 	drain_txq = ath_drain_all_txq(sc, false);
--	spin_unlock_bh(&sc->sc_pcu_lock);
- 	if (!drain_txq)
- 		ath_reset(sc, false);
-+	spin_unlock_bh(&sc->sc_pcu_lock);
- 	ath9k_ps_restore(sc);
- 	ieee80211_wake_queues(hw);
- 
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -565,11 +565,8 @@ static void ath_tx_complete_aggr(struct 
- 
- 	rcu_read_unlock();
- 
--	if (needreset) {
--		spin_unlock_bh(&sc->sc_pcu_lock);
-+	if (needreset)
- 		ath_reset(sc, false);
--		spin_lock_bh(&sc->sc_pcu_lock);
--	}
- }
+--- a/net/mac80211/debugfs_netdev.c
++++ b/net/mac80211/debugfs_netdev.c
+@@ -394,7 +394,7 @@ static ssize_t ieee80211_if_parse_uapsd_
+ __IEEE80211_IF_FILE_W(uapsd_max_sp_len);
  
- static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
-@@ -664,7 +661,8 @@ static int ath_compute_num_delims(struct
- 	 * TODO - this could be improved to be dependent on the rate.
- 	 *      The hardware can keep up at lower rates, but not higher rates
- 	 */
--	if (fi->keyix != ATH9K_TXKEYIX_INVALID)
-+	if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&
-+	    !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))
- 		ndelim += ATH_AGGR_ENCRYPTDELIM;
+ /* AP attributes */
+-IEEE80211_IF_FILE(num_sta_authorized, u.ap.num_sta_authorized, ATOMIC);
++IEEE80211_IF_FILE(num_mcast_sta, u.ap.num_mcast_sta, ATOMIC);
+ IEEE80211_IF_FILE(num_sta_ps, u.ap.num_sta_ps, ATOMIC);
+ IEEE80211_IF_FILE(dtim_count, u.ap.dtim_count, DEC);
  
- 	/*
-@@ -2169,7 +2167,9 @@ static void ath_tx_complete_poll_work(st
- 	if (needreset) {
- 		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
- 			"tx hung, resetting the chip\n");
-+		spin_lock_bh(&sc->sc_pcu_lock);
- 		ath_reset(sc, true);
-+		spin_unlock_bh(&sc->sc_pcu_lock);
- 	}
+@@ -540,7 +540,7 @@ static void add_sta_files(struct ieee802
  
- 	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -236,7 +236,7 @@ static void ar9003_paprd_get_gain_table(
- 	memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
- 	memset(index, 0, sizeof(ah->paprd_gain_table_index));
- 
--	for (i = 0; i < 32; i++) {
-+	for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- 		entry[i] = REG_READ(ah, reg);
- 		index[i] = (entry[i] >> 24) & 0xff;
- 		reg += 4;
-@@ -246,13 +246,13 @@ static void ar9003_paprd_get_gain_table(
- static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
- 					    int target_power)
+ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
  {
--	int olpc_gain_delta = 0;
-+	int olpc_gain_delta = 0, cl_gain_mod;
- 	int alpha_therm, alpha_volt;
- 	int therm_cal_value, volt_cal_value;
- 	int therm_value, volt_value;
- 	int thermal_gain_corr, voltage_gain_corr;
- 	int desired_scale, desired_gain = 0;
--	u32 reg;
-+	u32 reg_olpc  = 0, reg_cl_gain  = 0;
- 
- 	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
- 		    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-@@ -271,15 +271,29 @@ static unsigned int ar9003_get_desired_g
- 	volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
- 				    AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
- 
--	if (chain == 0)
--		reg = AR_PHY_TPC_11_B0;
--	else if (chain == 1)
--		reg = AR_PHY_TPC_11_B1;
--	else
--		reg = AR_PHY_TPC_11_B2;
-+	switch (chain) {
-+	case 0:
-+		reg_olpc = AR_PHY_TPC_11_B0;
-+		reg_cl_gain = AR_PHY_CL_TAB_0;
-+		break;
-+	case 1:
-+		reg_olpc = AR_PHY_TPC_11_B1;
-+		reg_cl_gain = AR_PHY_CL_TAB_1;
-+		break;
-+	case 2:
-+		reg_olpc = AR_PHY_TPC_11_B2;
-+		reg_cl_gain = AR_PHY_CL_TAB_2;
-+		break;
-+	default:
-+		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
-+		"Invalid chainmask: %d\n", chain);
-+		break;
-+	}
- 
--	olpc_gain_delta = REG_READ_FIELD(ah, reg,
-+	olpc_gain_delta = REG_READ_FIELD(ah, reg_olpc,
- 					 AR_PHY_TPC_11_OLPC_GAIN_DELTA);
-+	cl_gain_mod = REG_READ_FIELD(ah, reg_cl_gain,
-+					 AR_PHY_CL_TAB_CL_GAIN_MOD);
- 
- 	if (olpc_gain_delta >= 128)
- 		olpc_gain_delta = olpc_gain_delta - 256;
-@@ -289,7 +303,7 @@ static unsigned int ar9003_get_desired_g
- 	voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
- 			     (128 / 2)) / 128;
- 	desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
--	    voltage_gain_corr + desired_scale;
-+	    voltage_gain_corr + desired_scale + cl_gain_mod;
- 
- 	return desired_gain;
- }
-@@ -727,7 +741,7 @@ int ar9003_paprd_setup_gain_table(struct
- 	desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
- 
- 	gain_index = 0;
--	for (i = 0; i < 32; i++) {
-+	for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- 		if (ah->paprd_gain_table_index[i] >= desired_gain)
- 			break;
- 		gain_index++;
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -1121,6 +1121,9 @@
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5	0x3F00
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5_S	8
- 
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD		0x1f
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD_S		0
-+
- void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
- 
- #endif  /* AR9003_PHY_H */
---- a/drivers/net/wireless/ath/ath5k/eeprom.c
-+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
-@@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k
- 		if (!chinfo[pier].pd_curves)
- 			continue;
- 
--		for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
-+		for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
- 			struct ath5k_pdgain_info *pd =
- 					&chinfo[pier].pd_curves[pdg];
- 
--			if (pd != NULL) {
--				kfree(pd->pd_step);
--				kfree(pd->pd_pwr);
--			}
-+			kfree(pd->pd_step);
-+			kfree(pd->pd_pwr);
+-	DEBUGFS_ADD(num_sta_authorized);
++	DEBUGFS_ADD(num_mcast_sta);
+ 	DEBUGFS_ADD(num_sta_ps);
+ 	DEBUGFS_ADD(dtim_count);
+ 	DEBUGFS_ADD(num_buffered_multicast);
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -282,7 +282,7 @@ struct ieee80211_if_ap {
+ 	u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)];
+ 	struct sk_buff_head ps_bc_buf;
+ 	atomic_t num_sta_ps; /* number of stations in PS mode */
+-	atomic_t num_sta_authorized; /* number of authorized stations */
++	atomic_t num_mcast_sta; /* number of stations receiving multicast */
+ 	int dtim_count;
+ 	bool dtim_bc_mc;
+ };
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -1418,14 +1418,14 @@ int sta_info_move_state(struct sta_info 
+ 			set_bit(WLAN_STA_ASSOC, &sta->_flags);
+ 		} else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
+ 			if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
+-				atomic_dec(&sta->sdata->u.ap.num_sta_authorized);
++				atomic_dec(&sta->sdata->u.ap.num_mcast_sta);
+ 			clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
  		}
- 
- 		kfree(chinfo[pier].pd_curves);
+ 		break;
+ 	case IEEE80211_STA_AUTHORIZED:
+ 		if (sta->sta_state == IEEE80211_STA_ASSOC) {
+ 			if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
+-				atomic_inc(&sta->sdata->u.ap.num_sta_authorized);
++				atomic_inc(&sta->sdata->u.ap.num_mcast_sta);
+ 			set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+ 		}
+ 		break;
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -306,7 +306,7 @@ ieee80211_tx_h_check_assoc(struct ieee80
+ 		}
+ 	} else if (unlikely(tx->sdata->vif.type == NL80211_IFTYPE_AP &&
+ 			    ieee80211_is_data(hdr->frame_control) &&
+-			    !atomic_read(&tx->sdata->u.ap.num_sta_authorized))) {
++			    !atomic_read(&tx->sdata->u.ap.num_mcast_sta))) {
+ 		/*
+ 		 * No associated STAs - no need to send multicast
+ 		 * frames.