svn commit: r248182 - head/sys/dev/ath/ath_hal/ar9002

[Adrian Chadd]

Author: adrian
Date: Tue Mar 12 03:03:24 2013
New Revision: 248182
URL: http://svnweb.freebsd.org/changeset/base/248182

Log:
  Use the correct antenna configuration variable here. "diversity" just
  controls whether it's on or off.
  
  Found by:	clang

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c	Tue Mar 12 02:54:49 2013	(r248181)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c	Tue Mar 12 03:03:24 2013	(r248182)
@@ -50,7 +50,7 @@ ar9285BTCoexAntennaDiversity(struct ath_
 	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_
 		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;