Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[linux-2.6-block.git] / drivers / net / wireless / ath / ath9k / init.c

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index a04d8616fe09f8ea26bea20513e9e80eaf374c1a..17c318902cb866e4b8fc36b43c56e02b4fa0d13d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -805,7 +805,7 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band)
                ah->curchan = &ah->channels[chan->hw_value];
                cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20);
                ath9k_cmn_get_channel(sc->hw, ah, &chandef);
-               ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true);
+               ath9k_hw_set_txpowerlimit(ah, MAX_COMBINED_POWER, true);
        }
 }