Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[~andy/linux] / drivers / net / wireless / ath / ath9k / ani.c

diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 4994bea809eb00db15a8899ee5d2dd966002db4a..be466b0ef7a7725c736114ee439596ca45a4a380 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -319,9 +319,6 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
                        ah->ani_function = 0;
        }
 
-       /* always allow mode (on/off) to be controlled */
-       ah->ani_function |= ATH9K_ANI_MODE;
-
        ofdm_nil = max_t(int, ATH9K_ANI_OFDM_DEF_LEVEL,
                         aniState->ofdmNoiseImmunityLevel);
        cck_nil = max_t(int, ATH9K_ANI_CCK_DEF_LEVEL,