svn commit: r227019 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002

[Adrian Chadd]

Author: adrian
Date: Wed Nov  2 14:23:57 2011
New Revision: 227019
URL: http://svn.freebsd.org/changeset/base/227019

Log:
  Add a fix from atheros/linux ath9k, although it doesn't fix my merlin issue.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Wed Nov  2 13:51:29 2011	(r227018)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Wed Nov  2 14:23:57 2011	(r227019)
@@ -131,7 +131,7 @@ ar9280InitPLL(struct ath_hal *ah, const 
 	OS_DELAY(RTC_PLL_SETTLE_DELAY);
 	OS_REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_SLEEP_DERIVED_CLK);
 }
-
+	
 /* XXX shouldn't be here! */
 #define	EEP_MINOR(_ah) \
 	(AH_PRIVATE(_ah)->ah_eeversion & AR5416_EEP_VER_MINOR_MASK)
@@ -688,7 +688,9 @@ ar9280SpurMitigate(struct ath_hal *ah, c
 
     for (i = 0; i < 123; i++) {
         if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
-            if ((abs(cur_vit_mask - bin)) < 75) {
+            /* XXX GCC 4.2.4 workaround? */
+            volatile int tmp_abs = abs(cur_vit_mask - bin);
+            if (tmp_abs < 75) {
                 mask_amt = 1;
             } else {
                 mask_amt = 0;