iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath9k: add struct ath_spec_scan_priv

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

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Oleksij Rempel 2014-11-06 08:53:18 +01:00 committed by John W. Linville
parent d7d8b83473
commit 911ea79f43
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -1029,9 +1029,9 @@ struct ath_softc {
u64 dfs_prev_pulse_ts; u64 dfs_prev_pulse_ts;
u32 wow_enabled; u32 wow_enabled;
/* relay(fs) channel for spectral scan */ /* relay(fs) channel for spectral scan */
struct rchan *rfs_chan_spec_scan;
enum spectral_mode spectral_mode; enum spectral_mode spectral_mode;
struct ath_spec_scan spec_config; struct ath_spec_scan spec_config;
struct ath_spec_scan_priv spec_priv;
struct ieee80211_vif *tx99_vif; struct ieee80211_vif *tx99_vif;
struct sk_buff *tx99_skb; struct sk_buff *tx99_skb;

12
drivers/net/wireless/ath/ath9k/spectral.c
View File

@ -28,12 +28,12 @@ static void ath_debug_send_fft_sample(struct ath_softc *sc,
struct fft_sample_tlv *fft_sample_tlv) struct fft_sample_tlv *fft_sample_tlv)
{ {
int length; int length;
if (!sc->rfs_chan_spec_scan) if (!sc->spec_priv.rfs_chan_spec_scan)
return; return;
length = __be16_to_cpu(fft_sample_tlv->length) + length = __be16_to_cpu(fft_sample_tlv->length) +
sizeof(*fft_sample_tlv); 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. */ /* 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) void ath9k_spectral_deinit_debug(struct ath_softc *sc)
{ {
if (config_enabled(CONFIG_ATH9K_DEBUGFS) && sc->rfs_chan_spec_scan) { if (config_enabled(CONFIG_ATH9K_DEBUGFS) && sc->spec_priv.rfs_chan_spec_scan) {
relay_close(sc->rfs_chan_spec_scan); relay_close(sc->spec_priv.rfs_chan_spec_scan);
sc->rfs_chan_spec_scan = NULL; sc->spec_priv.rfs_chan_spec_scan = NULL;
} }
} }
void ath9k_spectral_init_debug(struct ath_softc *sc) 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, sc->debug.debugfs_phy,
1024, 256, &rfs_spec_scan_cb, 1024, 256, &rfs_spec_scan_cb,
NULL); NULL);

3
drivers/net/wireless/ath/ath9k/spectral.h
View File

@ -92,6 +92,9 @@ struct ath_ht20_40_fft_packet {
struct ath_radar_info radar_info; struct ath_radar_info radar_info;
} __packed; } __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)) #define SPECTRAL_HT20_40_TOTAL_DATA_LEN (sizeof(struct ath_ht20_40_fft_packet))