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

Commit 2297f1c7 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: make ath9k_cmn_update_ichannel static 



Rework its wrapper function to make it more generic, using it as a
replacement for previous calls to ath9k_cmn_update_ichannel.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6b21fd20

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

+8 −8
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_keytype); 
/*

 * Update internal channel flags.

 */

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

static void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

				      struct cfg80211_chan_def *chandef)

{

	struct ieee80211_channel *chan = chandef->chan;
@@ -88,25 +88,25 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan, 


	ichan->channelFlags = flags;

}

EXPORT_SYMBOL(ath9k_cmn_update_ichannel);



/*

 * Get the internal channel reference.

 */

struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,

					       struct ath_hw *ah)

struct ath9k_channel *ath9k_cmn_get_channel(struct ieee80211_hw *hw,

					    struct ath_hw *ah,

					    struct cfg80211_chan_def *chandef)

{

	struct ieee80211_channel *curchan = hw->conf.chandef.chan;

	struct ieee80211_channel *curchan = chandef->chan;

	struct ath9k_channel *channel;

	u8 chan_idx;



	chan_idx = curchan->hw_value;

	channel = &ah->channels[chan_idx];

	ath9k_cmn_update_ichannel(channel, &hw->conf.chandef);

	ath9k_cmn_update_ichannel(channel, chandef);



	return channel;

}

EXPORT_SYMBOL(ath9k_cmn_get_curchannel);

EXPORT_SYMBOL(ath9k_cmn_get_channel);



int ath9k_cmn_count_streams(unsigned int chainmask, int max)

{

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

+3 −4
Original line number Diff line number Diff line
@@ -43,10 +43,9 @@ 
	(((x) + ((mul)/2)) / (mul))



int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

struct ath9k_channel *ath9k_cmn_get_channel(struct ieee80211_hw *hw,

					    struct ath_hw *ah,

					    struct cfg80211_chan_def *chandef);

struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,

					       struct ath_hw *ah);

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);

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

+2 −4
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw) 
	WMI_CMD(WMI_FLUSH_RECV_CMDID);



	/* setup initial channel */

	init_channel = ath9k_cmn_get_curchannel(hw, ah);

	init_channel = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);



	ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);

	if (ret) {
@@ -1188,9 +1188,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed) 
		ath_dbg(common, CONFIG, "Set channel: %d MHz\n",

			curchan->center_freq);



		ath9k_cmn_update_ichannel(&priv->ah->channels[pos],

					  &hw->conf.chandef);



		ath9k_cmn_get_channel(hw, priv->ah, &hw->conf.chandef);

		if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {

			ath_err(common, "Unable to set channel\n");

			ret = -EINVAL;

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

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) 
		chan = &sband->channels[i];

		ah->curchan = &ah->channels[chan->hw_value];

		cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20);

		ath9k_cmn_update_ichannel(ah->curchan, &chandef);

		ath9k_cmn_get_channel(sc->hw, ah, &chandef);

		ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true);

	}

}

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

+3 −4
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	ath9k_ps_wakeup(sc);

	mutex_lock(&sc->mutex);



	init_channel = ath9k_cmn_get_curchannel(hw, ah);

	init_channel = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);



	/* Reset SERDES registers */

	ath9k_hw_configpcipowersave(ah, false);
@@ -804,7 +804,7 @@ static void ath9k_stop(struct ieee80211_hw *hw) 
	}



	if (!ah->curchan)

		ah->curchan = ath9k_cmn_get_curchannel(hw, ah);

		ah->curchan = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);



	ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);

	ath9k_hw_phy_disable(ah);
@@ -1224,8 +1224,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		ath_update_survey_stats(sc);

		spin_unlock_irqrestore(&common->cc_lock, flags);



		ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],

					  &conf->chandef);

		ath9k_cmn_get_channel(hw, ah, &conf->chandef);



		/*

		 * If the operating channel changes, change the survey in-use flags