ath9k: fix radar parameters initialization

Move ath9k_hw_set_radar_params() in ath9k_hw_reset() in order to avoid
AR_PHY_RADAR registers are overwritten after hw reset

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index a1b3282bd29e5e0b95a67b46f4324ba97fb7fdf5..d2a0f126377199e6afa867db1d136f090de9c6f2 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -83,8 +83,6 @@ static int ath_set_channel(struct ath_softc *sc)
        if (hw->conf.radar_enabled) {
                u32 rxfilter;
 
-               /* set HW specific DFS configuration */
-               ath9k_hw_set_radar_params(ah);
                rxfilter = ath9k_hw_getrxfilter(ah);
                rxfilter |= ATH9K_RX_FILTER_PHYRADAR |
                                ATH9K_RX_FILTER_PHYERR;

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 69bbea1184d211b5f47b1d99bce99226b6ba9f65..ef5f5a6ae14befdc69617e2f3ef1a70d83e3c728 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1954,6 +1954,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
        if (AR_SREV_9565(ah) && common->bt_ant_diversity)
                REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
 
+       if (ah->hw->conf.radar_enabled) {
+               /* set HW specific DFS configuration */
+               ath9k_hw_set_radar_params(ah);
+       }
+
        return 0;
 }
 EXPORT_SYMBOL(ath9k_hw_reset);