ath9k: Allow user to change tx power when asked

We were also changing tx power even when we were not asked to,
this enforces the change only when we are asked nicely. When
not asked we simply try to use the max power, we don't tx power
at all for rate control.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index a7656a3ea1b0..795fed5cadfa 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1250,7 +1250,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 sc->sc_ah->ah_channels[pos].chanmode =
                         ath_get_extchanmode(sc, curchan);
 
-        sc->sc_config.txpowlimit = 2 * conf->power_level;
+        if (changed & IEEE80211_CONF_CHANGE_POWER)
+                sc->sc_config.txpowlimit = 2 * conf->power_level;
 
         /* set h/w channel */
         if (ath_set_channel(sc, &sc->sc_ah->ah_channels[pos]) < 0)