aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-06-12 17:22:29 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-06-14 15:39:33 -0400
commit9cc3271faa3967754ca1d6ac982e91e347c55489 (patch)
treec31b054e5c33c7b1de3b5881f7d1893bbaf8d4a3 /drivers/net/wireless/ath/ath9k/main.c
parent716f7fc5b83ec04c53274a4810a723747e12f910 (diff)
downloadkernel_samsung_smdk4412-9cc3271faa3967754ca1d6ac982e91e347c55489.zip
kernel_samsung_smdk4412-9cc3271faa3967754ca1d6ac982e91e347c55489.tar.gz
kernel_samsung_smdk4412-9cc3271faa3967754ca1d6ac982e91e347c55489.tar.bz2
ath9k_hw: remove ATH9K_CAP_TXPOW
replace calls that read this capability with accesses to ath9k_hw's regulatory data. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index f38da29..c8de50f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -51,13 +51,11 @@ static void ath_cache_conf_rate(struct ath_softc *sc,
static void ath_update_txpow(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
- u32 txpow;
if (sc->curtxpow != sc->config.txpowlimit) {
ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit);
/* read back in case value is clamped */
- ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
- sc->curtxpow = txpow;
+ sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
}
}