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

Commit 45c67f6f authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: move channel change code to ath_set_channel 



Preparation for adding the scanning state machine to ath9k

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

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

+78 −72
Original line number Diff line number Diff line
@@ -302,17 +302,91 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) 
 * by reseting the chip.  To accomplish this we must first cleanup any pending

 * DMA, then restart stuff.

*/

static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,

		    struct ath9k_channel *hchan)

static int ath_set_channel(struct ath_softc *sc, struct cfg80211_chan_def *chandef)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ieee80211_hw *hw = sc->hw;

	struct ath9k_channel *hchan;

	struct ieee80211_channel *chan = chandef->chan;

	unsigned long flags;

	bool offchannel;

	int pos = chan->hw_value;

	int old_pos = -1;

	int r;



	if (test_bit(SC_OP_INVALID, &sc->sc_flags))

		return -EIO;



	r = ath_reset_internal(sc, hchan);

	offchannel = !!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL);



	if (ah->curchan)

		old_pos = ah->curchan - &ah->channels[0];



	ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",

		chan->center_freq, chandef->width);



	/* update survey stats for the old channel before switching */

	spin_lock_irqsave(&common->cc_lock, flags);

	ath_update_survey_stats(sc);

	spin_unlock_irqrestore(&common->cc_lock, flags);



	ath9k_cmn_get_channel(hw, ah, chandef);



	/*

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

	 * along with it.

	 * Reset the survey data for the new channel, unless we're switching

	 * back to the operating channel from an off-channel operation.

	 */

	if (!offchannel && sc->cur_survey != &sc->survey[pos]) {

		if (sc->cur_survey)

			sc->cur_survey->filled &= ~SURVEY_INFO_IN_USE;



		sc->cur_survey = &sc->survey[pos];



		memset(sc->cur_survey, 0, sizeof(struct survey_info));

		sc->cur_survey->filled |= SURVEY_INFO_IN_USE;

	} else if (!(sc->survey[pos].filled & SURVEY_INFO_IN_USE)) {

		memset(&sc->survey[pos], 0, sizeof(struct survey_info));

	}



	hchan = &sc->sc_ah->channels[pos];

	r = ath_reset_internal(sc, hchan);

	if (r)

		return r;



	/*

	 * The most recent snapshot of channel->noisefloor for the old

	 * channel is only available after the hardware reset. Copy it to

	 * the survey stats now.

	 */

	if (old_pos >= 0)

		ath_update_survey_nf(sc, old_pos);



	/*

	 * Enable radar pulse detection if on a DFS channel. Spectral

	 * scanning and radar detection can not be used concurrently.

	 */

	if (hw->conf.radar_enabled) {

		u32 rxfilter;



		/* set HW specific DFS configuration */

		ath9k_hw_set_radar_params(ah);

		rxfilter = ath9k_hw_getrxfilter(ah);

		rxfilter |= ATH9K_RX_FILTER_PHYRADAR |

				ATH9K_RX_FILTER_PHYERR;

		ath9k_hw_setrxfilter(ah, rxfilter);

		ath_dbg(common, DFS, "DFS enabled at freq %d\n",

			chan->center_freq);

	} else {

		/* perform spectral scan if requested. */

		if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&

			sc->spectral_mode == SPECTRAL_CHANSCAN)

			ath9k_spectral_scan_trigger(hw);

	}



	return 0;

}



static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
@@ -1208,80 +1282,12 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
	}



	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {

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

		int pos = curchan->hw_value;

		int old_pos = -1;

		unsigned long flags;



		if (ah->curchan)

			old_pos = ah->curchan - &ah->channels[0];



		ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",

			curchan->center_freq, hw->conf.chandef.width);



		/* update survey stats for the old channel before switching */

		spin_lock_irqsave(&common->cc_lock, flags);

		ath_update_survey_stats(sc);

		spin_unlock_irqrestore(&common->cc_lock, flags);



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



		/*

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

		 * along with it.

		 * Reset the survey data for the new channel, unless we're switching

		 * back to the operating channel from an off-channel operation.

		 */

		if (!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) &&

		    sc->cur_survey != &sc->survey[pos]) {



			if (sc->cur_survey)

				sc->cur_survey->filled &= ~SURVEY_INFO_IN_USE;



			sc->cur_survey = &sc->survey[pos];



			memset(sc->cur_survey, 0, sizeof(struct survey_info));

			sc->cur_survey->filled |= SURVEY_INFO_IN_USE;

		} else if (!(sc->survey[pos].filled & SURVEY_INFO_IN_USE)) {

			memset(&sc->survey[pos], 0, sizeof(struct survey_info));

		}



		if (ath_set_channel(sc, hw, &sc->sc_ah->channels[pos]) < 0) {

		if (ath_set_channel(sc, &hw->conf.chandef) < 0) {

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

			mutex_unlock(&sc->mutex);

			ath9k_ps_restore(sc);

			return -EINVAL;

		}



		/*

		 * The most recent snapshot of channel->noisefloor for the old

		 * channel is only available after the hardware reset. Copy it to

		 * the survey stats now.

		 */

		if (old_pos >= 0)

			ath_update_survey_nf(sc, old_pos);



		/*

		 * Enable radar pulse detection if on a DFS channel. Spectral

		 * scanning and radar detection can not be used concurrently.

		 */

		if (hw->conf.radar_enabled) {

			u32 rxfilter;



			/* set HW specific DFS configuration */

			ath9k_hw_set_radar_params(ah);

			rxfilter = ath9k_hw_getrxfilter(ah);

			rxfilter |= ATH9K_RX_FILTER_PHYRADAR |

				    ATH9K_RX_FILTER_PHYERR;

			ath9k_hw_setrxfilter(ah, rxfilter);

			ath_dbg(common, DFS, "DFS enabled at freq %d\n",

				curchan->center_freq);

		} else {

			/* perform spectral scan if requested. */

			if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&

			    sc->spectral_mode == SPECTRAL_CHANSCAN)

				ath9k_spectral_scan_trigger(hw);

		}

	}



	if (changed & IEEE80211_CONF_CHANGE_POWER) {