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

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

ath9k: add struct ath_spec_scan_priv 



and move rfs_chan_spec_scan to this struct. We will need it
for common spectral scan code.

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

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

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

	u32 wow_enabled;

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

	struct rchan *rfs_chan_spec_scan;

	enum spectral_mode spectral_mode;

	struct ath_spec_scan spec_config;

	struct ath_spec_scan_priv spec_priv;



	struct ieee80211_vif *tx99_vif;

	struct sk_buff *tx99_skb;

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

+6 −6
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ static void ath_debug_send_fft_sample(struct ath_softc *sc, 
				      struct fft_sample_tlv *fft_sample_tlv)

{

	int length;

	if (!sc->rfs_chan_spec_scan)

	if (!sc->spec_priv.rfs_chan_spec_scan)

		return;



	length = __be16_to_cpu(fft_sample_tlv->length) +

		 sizeof(*fft_sample_tlv);

	relay_write(sc->rfs_chan_spec_scan, fft_sample_tlv, length);

	relay_write(sc->spec_priv.rfs_chan_spec_scan, fft_sample_tlv, length);

}



/* returns 1 if this was a spectral frame, even if not handled. */
@@ -508,15 +508,15 @@ static struct rchan_callbacks rfs_spec_scan_cb = { 


void ath9k_spectral_deinit_debug(struct ath_softc *sc)

{

	if (config_enabled(CONFIG_ATH9K_DEBUGFS) && sc->rfs_chan_spec_scan) {

		relay_close(sc->rfs_chan_spec_scan);

		sc->rfs_chan_spec_scan = NULL;

	if (config_enabled(CONFIG_ATH9K_DEBUGFS) && sc->spec_priv.rfs_chan_spec_scan) {

		relay_close(sc->spec_priv.rfs_chan_spec_scan);

		sc->spec_priv.rfs_chan_spec_scan = NULL;

	}

}



void ath9k_spectral_init_debug(struct ath_softc *sc)

{

	sc->rfs_chan_spec_scan = relay_open("spectral_scan",

	sc->spec_priv.rfs_chan_spec_scan = relay_open("spectral_scan",

					    sc->debug.debugfs_phy,

					    1024, 256, &rfs_spec_scan_cb,

					    NULL);

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

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ struct ath_ht20_40_fft_packet { 
	struct ath_radar_info radar_info;

} __packed;



struct ath_spec_scan_priv {

	struct rchan *rfs_chan_spec_scan;

};



#define SPECTRAL_HT20_40_TOTAL_DATA_LEN	(sizeof(struct ath_ht20_40_fft_packet))