diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-17 15:05:26 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-17 15:05:26 -0400 |
| commit | 41ebe9cde738a972d05c7282e09f5ed54cff0e8d (patch) | |
| tree | 223bf0feb7305e46989b60c3f070bef87d5fcab4 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | fd38f734cb8200529e281338514945fcbff2364b (diff) | |
| parent | 5c1381ac3f3f49ab1e0886ea8f1432c9a5def519 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 39514de044ef..af1b32549531 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -626,7 +626,6 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) struct ieee80211_supported_band *sband; struct ieee80211_channel *chan; struct ath_hw *ah = sc->sc_ah; - struct ath_regulatory *reg = ath9k_hw_regulatory(ah); int i; sband = &sc->sbands[band]; @@ -635,7 +634,6 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) ah->curchan = &ah->channels[chan->hw_value]; ath9k_cmn_update_ichannel(ah->curchan, chan, NL80211_CHAN_HT20); ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true); - chan->max_power = reg->max_power_level / 2; } } |