summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-03-12 03:03:24 +0000
committeradrian <adrian@FreeBSD.org>2013-03-12 03:03:24 +0000
commit2601b73cdc2962446a9a65350d22068c774ef6a7 (patch)
tree0084b0de8f03c2ffc65c78f79d34548bf522e6f6
parent28932ae0428b14b94a60450109a438be3175f064 (diff)
downloadFreeBSD-src-2601b73cdc2962446a9a65350d22068c774ef6a7.zip
FreeBSD-src-2601b73cdc2962446a9a65350d22068c774ef6a7.tar.gz
Use the correct antenna configuration variable here. "diversity" just
controls whether it's on or off. Found by: clang
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
index 093b2b4..9ad7620 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
@@ -50,7 +50,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah)
if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) ||
(AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) {
if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) &&
- (AH5212(ah)->ah_diversity == HAL_ANT_VARIABLE)) {
+ (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) {
/* Enable antenna diversity */
ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_ENABLE;
ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_ENABLE;
@@ -63,7 +63,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah)
OS_REG_WRITE(ah, AR_PHY_SWITCH_COM,
HAL_BT_COEX_ANT_DIV_SWITCH_COM);
OS_REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0, 0, 0xf0000000);
- } else if (AH5212(ah)->ah_diversity == HAL_ANT_FIXED_B) {
+ } else if (AH5212(ah)->ah_antControl == HAL_ANT_FIXED_B) {
/* Disable antenna diversity. Use antenna B(LNA2) only. */
ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_FIXED_B;
ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_FIXED_B;
OpenPOWER on IntegriCloud