From a469b3f6aef97c123c1d0a03adceb26317dea439 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 23 Jul 2010 04:31:56 +0200 Subject: [PATCH] --- yaml --- r: 203818 b: refs/heads/master c: 487f0e010cf5b6ba504150dfb20c21fd93e3b9e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/calib.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 93cb55f7b632..1b16c149cd92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9292c0db7b4e98ae6d34a662ef49a8bd127fd8f +refs/heads/master: 487f0e010cf5b6ba504150dfb20c21fd93e3b9e6 diff --git a/trunk/drivers/net/wireless/ath/ath9k/calib.c b/trunk/drivers/net/wireless/ath/ath9k/calib.c index 07372462a8ea..139289e4e933 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/calib.c +++ b/trunk/drivers/net/wireless/ath/ath9k/calib.c @@ -172,26 +172,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan) struct ath9k_nfcal_hist *h; unsigned i, j; int32_t val; - u8 chainmask; + u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask; struct ath_common *common = ath9k_hw_common(ah); - if (AR_SREV_9300_20_OR_LATER(ah)) - chainmask = 0x3F; - else if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) - chainmask = 0x9; - else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) { - if ((ah->rxchainmask & 0x2) || (ah->rxchainmask & 0x4)) - chainmask = 0x1B; - else - chainmask = 0x09; - } else { - if (ah->rxchainmask & 0x4) - chainmask = 0x3F; - else if (ah->rxchainmask & 0x2) - chainmask = 0x1B; - else - chainmask = 0x09; - } h = ah->nfCalHist; for (i = 0; i < NUM_NF_READINGS; i++) {