X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=ath_hal%2Far5210%2Far5210_misc.c;h=f22a51af1a9c705acd46ffe2e9a9195610a4f81c;hb=0d741ab4674083248a31f62a05ffbb32e443bb14;hp=a6739171cfb8971e26a35eb7c43f3f13734813c1;hpb=57024653213ca800870f3dd899b86e6f1db0a8ec;p=madwifi%2F.git

diff --git a/ath_hal/ar5210/ar5210_misc.c b/ath_hal/ar5210/ar5210_misc.c
index a673917..f22a51a 100644
--- a/ath_hal/ar5210/ar5210_misc.c
+++ b/ath_hal/ar5210/ar5210_misc.c
@@ -330,11 +330,11 @@ ar5210WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
 uint64_t
 ar5210GetTsf64(struct ath_hal *ah)
 {
-	uint32_t low1, low2, u32;
+	uint32_t low1, low2, up32;
 
 	/* sync multi-word read */
 	low1 = OS_REG_READ(ah, AR_TSF_L32);
-	u32 = OS_REG_READ(ah, AR_TSF_U32);
+	up32 = OS_REG_READ(ah, AR_TSF_U32);
 	low2 = OS_REG_READ(ah, AR_TSF_L32);
 	if (low2 < low1) {	/* roll over */
 		/*
@@ -347,9 +347,9 @@ ar5210GetTsf64(struct ath_hal *ah)
 		 * read which can be noticeable when doing things
 		 * like timestamping packets in monitor mode.
 		 */
-		u32++;
+		up32++;
 	}
-	return (((uint64_t) u32) << 32) | ((uint64_t) low2);
+	return (((uint64_t) up32) << 32) | ((uint64_t) low2);
 }
 
 /*