diff options
author | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
commit | 5be1334062a2f358dc65016b5181e6edbfe3bd1e (patch) | |
tree | 02ec7afd0cacda2f364e49f0c8391690f6b41a24 /drivers/net/wireless/ath/ath9k/init.c | |
parent | f2c31e32b378a6653f8de606149d963baf11d7d3 (diff) | |
parent | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index ac5107172f9..aa0ff7e2c92 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -670,8 +670,10 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) static void ath9k_init_txpower_limits(struct ath_softc *sc) { struct ath_hw *ah = sc->sc_ah; + struct ath_common *common = ath9k_hw_common(sc->sc_ah); struct ath9k_channel *curchan = ah->curchan; + ah->txchainmask = common->tx_chainmask; if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ); if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) |