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

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

ath9k: move spectral_mode to ath_spec_scan_priv 



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

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

+0 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,6 @@ struct ath_softc { 
	u64 dfs_prev_pulse_ts;

	u32 wow_enabled;

	/* relay(fs) channel for spectral scan */

	enum spectral_mode spectral_mode;

	struct ath_spec_scan spec_config;

	struct ath_spec_scan_priv spec_priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int ath_set_channel(struct ath_softc *sc) 
	} else {

		/* perform spectral scan if requested. */

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

			sc->spectral_mode == SPECTRAL_CHANSCAN)

			sc->spec_priv.spectral_mode == SPECTRAL_CHANSCAN)

			ath9k_spectral_scan_trigger(hw);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw) 
	 * configuration, otherwise the register will have its values reset

	 * (on my ar9220 to value 0x01002310)

	 */

	ath9k_spectral_scan_config(hw, sc->spectral_mode);

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

	ath9k_hw_ops(ah)->spectral_scan_trigger(ah);

	ath9k_ps_restore(sc);

}
@@ -1404,7 +1404,7 @@ int ath9k_spectral_scan_config(struct ieee80211_hw *hw, 
	ath9k_hw_ops(ah)->spectral_scan_config(ah, &sc->spec_config);

	ath9k_ps_restore(sc);



	sc->spectral_mode = spectral_mode;

	sc->spec_priv.spectral_mode = spectral_mode;



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static ssize_t read_file_spec_scan_ctl(struct file *file, char __user *user_buf, 
	char *mode = "";

	unsigned int len;



	switch (sc->spectral_mode) {

	switch (sc->spec_priv.spectral_mode) {

	case SPECTRAL_DISABLED:

		mode = "disable";

		break;

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct ath_ht20_40_fft_packet { 


struct ath_spec_scan_priv {

	struct rchan *rfs_chan_spec_scan;

	enum spectral_mode spectral_mode;

};



#define SPECTRAL_HT20_40_TOTAL_DATA_LEN	(sizeof(struct ath_ht20_40_fft_packet))