ath9k_htc: make use common of function to update txpower (b2a5c3df) · Commits · 戴 / test

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -460,7 +460,6 @@ void ath9k_htc_ps_restore(struct ath9k_htc_priv *priv);
		void ath9k_ps_work(struct work_struct *work);
		bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
		enum ath9k_power_mode mode);
		void ath_update_txpow(struct ath9k_htc_priv *priv);

		void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv);
		void ath9k_htc_rfkill_poll_state(struct ieee80211_hw *hw);

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,8 @@ void ath9k_htc_radio_enable(struct ieee80211_hw *hw)
		ret, ah->curchan->channel);
		}

		ath_update_txpow(priv);
		ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
		&priv->curtxpow);

		/* Start RX */
		WMI_CMD(WMI_START_RECV_CMDID);

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

+8 −15

Original line number	Diff line number	Diff line
		@@ -24,17 +24,6 @@ static struct dentry *ath9k_debugfs_root;
		/* Utilities */
		/*************/

		void ath_update_txpow(struct ath9k_htc_priv *priv)
		{
		struct ath_hw *ah = priv->ah;

		if (priv->curtxpow != priv->txpowlimit) {
		ath9k_hw_set_txpowerlimit(ah, priv->txpowlimit, false);
		/* read back in case value is clamped */
		priv->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
		}
		}

		/* HACK Alert: Use 11NG for 2.4, use 11NA for 5 */
		static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,
		struct ath9k_channel *ichan)
		@@ -147,7 +136,8 @@ void ath9k_htc_reset(struct ath9k_htc_priv *priv)
		channel->center_freq, ret);
		}

		ath_update_txpow(priv);
		ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
		&priv->curtxpow);

		WMI_CMD(WMI_START_RECV_CMDID);
		ath9k_host_rx_init(priv);
		@@ -212,7 +202,8 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
		goto err;
		}

		ath_update_txpow(priv);
		ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
		&priv->curtxpow);

		WMI_CMD(WMI_START_RECV_CMDID);
		if (ret)
		@@ -988,7 +979,8 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
		return ret;
		}

		ath_update_txpow(priv);
		ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
		&priv->curtxpow);

		mode = ath9k_htc_get_curmode(priv, init_channel);
		htc_mode = cpu_to_be16(mode);
		@@ -1254,7 +1246,8 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)

		if (changed & IEEE80211_CONF_CHANGE_POWER) {
		priv->txpowlimit = 2 * conf->power_level;
		ath_update_txpow(priv);
		ath9k_cmn_update_txpow(priv->ah, priv->curtxpow,
		priv->txpowlimit, &priv->curtxpow);
		}

		if (changed & IEEE80211_CONF_CHANGE_IDLE) {

Admin message