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>

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index aebafaa28dce60b7bc825e46e0978b16d818117d..d4a6092d4ddb01bf3ff41ecfbb84ba6c98d60ce2 100644 (file)
--- 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 22695892963f1d75f2a58ae2c94eeff451f6932c..638320d4e381538fc203f143d1bdb84300ee6ad3 100644 (file)
--- 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;