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

Commit ef948da5 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k: use ath_common instead of ieee80211_hw in ath9k_spectral_scan_ 



we don't have here any ieee80211_hw dependencies any way.

Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 934bdc73

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ static int ath_set_channel(struct ath_softc *sc) 
		/* perform spectral scan if requested. */

		/* perform spectral scan if requested. */

		if (test_bit(ATH_OP_SCANNING, &common->op_flags) &&

		if (test_bit(ATH_OP_SCANNING, &common->op_flags) &&

			sc->spec_priv.spectral_mode == SPECTRAL_CHANSCAN)

			sc->spec_priv.spectral_mode == SPECTRAL_CHANSCAN)

			ath9k_spectral_scan_trigger(hw);

			ath9k_spectral_scan_trigger(common);

	}

	}





	return 0;

	return 0;

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

+5 −7
Original line number Original line Diff line number Diff line
@@ -1337,11 +1337,10 @@ static void ath9k_disable_ps(struct ath_softc *sc) 
	ath_dbg(common, PS, "PowerSave disabled\n");

	ath_dbg(common, PS, "PowerSave disabled\n");

}

}





void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw)

void ath9k_spectral_scan_trigger(struct ath_common *common)

{

{

	struct ath_softc *sc = hw->priv;

	struct ath_softc *sc = common->priv;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	u32 rxfilter;

	u32 rxfilter;





	if (config_enabled(CONFIG_ATH9K_TX99))

	if (config_enabled(CONFIG_ATH9K_TX99))
@@ -1363,17 +1362,16 @@ void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw) 
	 * configuration, otherwise the register will have its values reset

	 * configuration, otherwise the register will have its values reset

	 * (on my ar9220 to value 0x01002310)

	 * (on my ar9220 to value 0x01002310)

	 */

	 */

	ath9k_spectral_scan_config(hw, sc->spec_priv.spectral_mode);

	ath9k_spectral_scan_config(common, sc->spec_priv.spectral_mode);

	ath9k_hw_ops(ah)->spectral_scan_trigger(ah);

	ath9k_hw_ops(ah)->spectral_scan_trigger(ah);

	ath_ps_ops(common)->restore(common);

	ath_ps_ops(common)->restore(common);

}

}





int ath9k_spectral_scan_config(struct ieee80211_hw *hw,

int ath9k_spectral_scan_config(struct ath_common *common,

			       enum spectral_mode spectral_mode)

			       enum spectral_mode spectral_mode)

{

{

	struct ath_softc *sc = hw->priv;

	struct ath_softc *sc = common->priv;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);





	if (!ath9k_hw_ops(ah)->spectral_scan_trigger) {

	if (!ath9k_hw_ops(ah)->spectral_scan_trigger) {

		ath_err(common, "spectrum analyzer not implemented on this hardware\n");

		ath_err(common, "spectrum analyzer not implemented on this hardware\n");

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -253,18 +253,18 @@ static ssize_t write_file_spec_scan_ctl(struct file *file, 
	buf[len] = '\0';

	buf[len] = '\0';





	if (strncmp("trigger", buf, 7) == 0) {

	if (strncmp("trigger", buf, 7) == 0) {

		ath9k_spectral_scan_trigger(common->hw);

		ath9k_spectral_scan_trigger(common);

	} else if (strncmp("background", buf, 10) == 0) {

	} else if (strncmp("background", buf, 10) == 0) {

		ath9k_spectral_scan_config(common->hw, SPECTRAL_BACKGROUND);

		ath9k_spectral_scan_config(common, SPECTRAL_BACKGROUND);

		ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");

		ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");

	} else if (strncmp("chanscan", buf, 8) == 0) {

	} else if (strncmp("chanscan", buf, 8) == 0) {

		ath9k_spectral_scan_config(common->hw, SPECTRAL_CHANSCAN);

		ath9k_spectral_scan_config(common, SPECTRAL_CHANSCAN);

		ath_dbg(common, CONFIG, "spectral scan: channel scan mode enabled\n");

		ath_dbg(common, CONFIG, "spectral scan: channel scan mode enabled\n");

	} else if (strncmp("manual", buf, 6) == 0) {

	} else if (strncmp("manual", buf, 6) == 0) {

		ath9k_spectral_scan_config(common->hw, SPECTRAL_MANUAL);

		ath9k_spectral_scan_config(common, SPECTRAL_MANUAL);

		ath_dbg(common, CONFIG, "spectral scan: manual mode enabled\n");

		ath_dbg(common, CONFIG, "spectral scan: manual mode enabled\n");

	} else if (strncmp("disable", buf, 7) == 0) {

	} else if (strncmp("disable", buf, 7) == 0) {

		ath9k_spectral_scan_config(common->hw, SPECTRAL_DISABLED);

		ath9k_spectral_scan_config(common, SPECTRAL_DISABLED);

		ath_dbg(common, CONFIG, "spectral scan: disabled\n");

		ath_dbg(common, CONFIG, "spectral scan: disabled\n");

	} else {

	} else {

		return -EINVAL;

		return -EINVAL;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -133,8 +133,8 @@ static inline u8 spectral_bitmap_weight(u8 *bins) 
void ath9k_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);

void ath9k_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);

void ath9k_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);

void ath9k_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);





void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw);

void ath9k_spectral_scan_trigger(struct ath_common *common);

int ath9k_spectral_scan_config(struct ieee80211_hw *hw,

int ath9k_spectral_scan_config(struct ath_common *common,

			       enum spectral_mode spectral_mode);

			       enum spectral_mode spectral_mode);





#ifdef CONFIG_ATH9K_DEBUGFS

#ifdef CONFIG_ATH9K_DEBUGFS