aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ar9002_calib.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-18 12:50:19 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-18 12:50:19 -0800
commitf966a13f92913ce8cbd35bc7f066553c9f3d41b0 (patch)
tree5039770cf62f69317c974775190cc4f5919f8398 /drivers/net/wireless/ath/ath9k/ar9002_calib.c
parent7e96fbf2320782fb8f0970928026105cd34b41bd (diff)
parent38d59392b29437af3a702209b6a5196ef01f79a8 (diff)
downloadkernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.zip
kernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.gz
kernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9002_calib.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9002_calib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index ea2e7d7..5e300bd 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -679,10 +679,6 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,
/* Do NF cal only at longer intervals */
if (longcal || nfcal_pending) {
- /* Do periodic PAOffset Cal */
- ar9002_hw_pa_cal(ah, false);
- ar9002_hw_olc_temp_compensation(ah);
-
/*
* Get the value from the previous NF cal and update
* history buffer.
@@ -697,8 +693,12 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,
ath9k_hw_loadnf(ah, ah->curchan);
}
- if (longcal)
+ if (longcal) {
ath9k_hw_start_nfcal(ah, false);
+ /* Do periodic PAOffset Cal */
+ ar9002_hw_pa_cal(ah, false);
+ ar9002_hw_olc_temp_compensation(ah);
+ }
}
return iscaldone;