Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c84ef5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents 2360d2e8 3ad97fbc

drivers/net/wireless/ath/ath5k/phy.c

+87 −55
Original line number Diff line number Diff line
@@ -282,6 +282,34 @@ int ath5k_hw_phy_disable(struct ath5k_hw *ah) 
	return 0;

}



/*

 * Wait for synth to settle

 */

static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,

			struct ieee80211_channel *channel)

{

	/*

	 * On 5211+ read activation -> rx delay

	 * and use it (100ns steps).

	 */

	if (ah->ah_version != AR5K_AR5210) {

		u32 delay;

		delay = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &

			AR5K_PHY_RX_DELAY_M;

		delay = (channel->hw_value & CHANNEL_CCK) ?

			((delay << 2) / 22) : (delay / 10);

		if (ah->ah_bwmode == AR5K_BWMODE_10MHZ)

			delay = delay << 1;

		if (ah->ah_bwmode == AR5K_BWMODE_5MHZ)

			delay = delay << 2;

		/* XXX: /2 on turbo ? Let's be safe

		 * for now */

		udelay(100 + delay);

	} else {

		mdelay(1);

	}

}





/**********************\

* RF Gain optimization *
@@ -3237,6 +3265,13 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		/* Failed */

		if (i >= 100)

			return -EIO;



		/* Set channel and wait for synth */

		ret = ath5k_hw_channel(ah, channel);

		if (ret)

			return ret;



		ath5k_hw_wait_for_synth(ah, channel);

	}



	/*
@@ -3251,13 +3286,53 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
	if (ret)

		return ret;



	/* Write OFDM timings on 5212*/

	if (ah->ah_version == AR5K_AR5212 &&

		channel->hw_value & CHANNEL_OFDM) {



		ret = ath5k_hw_write_ofdm_timings(ah, channel);

		if (ret)

			return ret;



		/* Spur info is available only from EEPROM versions

		 * greater than 5.3, but the EEPROM routines will use

		 * static values for older versions */

		if (ah->ah_mac_srev >= AR5K_SREV_AR5424)

			ath5k_hw_set_spur_mitigation_filter(ah,

							    channel);

	}



	/* If we used fast channel switching

	 * we are done, release RF bus and

	 * fire up NF calibration.

	 *

	 * Note: Only NF calibration due to

	 * channel change, not AGC calibration

	 * since AGC is still running !

	 */

	if (fast) {

		/*

		 * Release RF Bus grant

		 */

		AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_RFBUS_REQ,

				    AR5K_PHY_RFBUS_REQ_REQUEST);



		/*

		 * Start NF calibration

		 */

		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,

					AR5K_PHY_AGCCTL_NF);



		return ret;

	}



	/*

	 * For 5210 we do all initialization using

	 * initvals, so we don't have to modify

	 * any settings (5210 also only supports

	 * a/aturbo modes)

	 */

	if ((ah->ah_version != AR5K_AR5210) && !fast) {

	if (ah->ah_version != AR5K_AR5210) {



		/*

		 * Write initial RF gain settings
@@ -3276,22 +3351,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		if (ret)

			return ret;



		/* Write OFDM timings on 5212*/

		if (ah->ah_version == AR5K_AR5212 &&

			channel->hw_value & CHANNEL_OFDM) {



			ret = ath5k_hw_write_ofdm_timings(ah, channel);

			if (ret)

				return ret;



			/* Spur info is available only from EEPROM versions

			 * greater than 5.3, but the EEPROM routines will use

			 * static values for older versions */

			if (ah->ah_mac_srev >= AR5K_SREV_AR5424)

				ath5k_hw_set_spur_mitigation_filter(ah,

								    channel);

		}



		/*Enable/disable 802.11b mode on 5111

		(enable 2111 frequency converter + CCK)*/

		if (ah->ah_radio == AR5K_RF5111) {
@@ -3322,34 +3381,8 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
	 */

	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);



	/*

	 * On 5211+ read activation -> rx delay

	 * and use it.

	 */

	if (ah->ah_version != AR5K_AR5210) {

		u32 delay;

		delay = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &

			AR5K_PHY_RX_DELAY_M;

		delay = (channel->hw_value & CHANNEL_CCK) ?

			((delay << 2) / 22) : (delay / 10);

		if (ah->ah_bwmode == AR5K_BWMODE_10MHZ)

			delay = delay << 1;

		if (ah->ah_bwmode == AR5K_BWMODE_5MHZ)

			delay = delay << 2;

		/* XXX: /2 on turbo ? Let's be safe

		 * for now */

		udelay(100 + delay);

	} else {

		mdelay(1);

	}

	ath5k_hw_wait_for_synth(ah, channel);



	if (fast)

		/*

		 * Release RF Bus grant

		 */

		AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_RFBUS_REQ,

				    AR5K_PHY_RFBUS_REQ_REQUEST);

	else {

	/*

	 * Perform ADC test to see if baseband is ready

	 * Set tx hold and check adc test register
@@ -3362,7 +3395,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		udelay(200);

	}

	ath5k_hw_reg_write(ah, phy_tst1, AR5K_PHY_TST1);

	}



	/*

	 * Start automatic gain control calibration

drivers/net/wireless/ath/ath9k/ath9k.h

+2 −0
Original line number Diff line number Diff line
@@ -602,6 +602,8 @@ struct ath_softc { 
	struct completion paprd_complete;

	bool paprd_pending;



	unsigned int hw_busy_count;



	u32 intrstatus;

	u32 sc_flags; /* SC_OP_* */

	u16 ps_flags; /* PS_* */

drivers/net/wireless/ath/ath9k/beacon.c

+3 −2
Original line number Diff line number Diff line
@@ -721,8 +721,9 @@ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif) 
		cur_conf->beacon_interval = 100;



	/*

	 * Some times we dont parse dtim period from mac80211, in that case

	 * use a default value

	 * We don't parse dtim period from mac80211 during the driver

	 * initialization as it breaks association with hidden-ssid

	 * AP and it causes latency in roaming

	 */

	if (cur_conf->dtim_period == 0)

		cur_conf->dtim_period = 1;

drivers/net/wireless/ath/ath9k/common.c

+11 −0
Original line number Diff line number Diff line
@@ -189,6 +189,17 @@ void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common, 
}

EXPORT_SYMBOL(ath9k_cmn_btcoex_bt_stomp);



void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,

			    u16 new_txpow, u16 *txpower)

{

	if (cur_txpow != new_txpow) {

		ath9k_hw_set_txpowerlimit(ah, new_txpow, false);

		/* read back in case value is clamped */

		*txpower = ath9k_hw_regulatory(ah)->power_limit;

	}

}

EXPORT_SYMBOL(ath9k_cmn_update_txpow);



static int __init ath9k_cmn_init(void)

{

	return 0;

drivers/net/wireless/ath/ath9k/common.h

+2 −0
Original line number Diff line number Diff line
@@ -68,3 +68,5 @@ struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw, 
int ath9k_cmn_count_streams(unsigned int chainmask, int max);

void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common,

				  enum ath_stomp_type stomp_type);

void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,

			    u16 new_txpow, u16 *txpower);