summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorOleksij Rempel <linux@rempel-privat.de>2014-11-06 08:53:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-11-11 16:31:13 -0500
commitdd7657be756551b23b3431d81e66a8d95a72c923 (patch)
tree869e393c20960706eb459c692e5e0ea88ea3a1b5 /drivers/net/wireless
parentc10b75af4344fe0e678d167cb401a94f565e978c (diff)
downloadtalos-op-linux-dd7657be756551b23b3431d81e66a8d95a72c923.tar.gz
talos-op-linux-dd7657be756551b23b3431d81e66a8d95a72c923.zip
ath9k: add ath_hw to ath_spec_scan_priv
spectral code mostly depends on ath_hw, not on ath_softc Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/spectral.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index aebafaa28dce..d4a6092d4ddb 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -351,6 +351,7 @@ static void ath9k_init_misc(struct ath_softc *sc)
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)
sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT;
+ sc->spec_priv.ah = sc->sc_ah;
sc->spec_priv.spec_config.enabled = 0;
sc->spec_priv.spec_config.short_repeat = true;
sc->spec_priv.spec_config.count = 8;
diff --git a/drivers/net/wireless/ath/ath9k/spectral.h b/drivers/net/wireless/ath/ath9k/spectral.h
index 22695892963f..638320d4e381 100644
--- a/drivers/net/wireless/ath/ath9k/spectral.h
+++ b/drivers/net/wireless/ath/ath9k/spectral.h
@@ -93,6 +93,7 @@ struct ath_ht20_40_fft_packet {
} __packed;
struct ath_spec_scan_priv {
+ struct ath_hw *ah;
/* relay(fs) channel for spectral scan */
struct rchan *rfs_chan_spec_scan;
enum spectral_mode spectral_mode;
OpenPOWER on IntegriCloud