This lets us now share more ANI routines accross different
chipsets.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
---
drivers/net/wireless/ath/ath9k/ani.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 52852fc..7e87cf4 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -316,6 +316,14 @@ static void ath9k_hw_update_phy_err_count(struct ath_hw *ah,
ath9k_hw_update_phy_err2_count(ah, phy_err_count2, reset_masks);
}
+static void ath9k_hw_get_phy_err_count(struct ath_hw *ah,
+ u32 *phy_err_count1,
+ u32 *phy_err_count2)
+{
+ *phy_err_count1 = REG_READ(ah, AR_PHY_ERR_1);
+ *phy_err_count2 = REG_READ(ah, AR_PHY_ERR_2);
+}
+
static void ath9k_ani_restart(struct ath_hw *ah)
{
struct ar5416AniState *aniState;
@@ -653,9 +661,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah,
aniState->listenTime += listenTime;
ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
-
- phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
- phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+ ath9k_hw_get_phy_err_count(ah, &phyCnt1, &phyCnt2);
if (phyCnt1 < aniState->ofdmPhyErrBase ||
phyCnt2 < aniState->cckPhyErrBase) {
@@ -807,8 +813,8 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
return;
/* NB: these are not reset-on-read */
- phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
- phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+ ath9k_hw_get_phy_err_count(ah, &phyCnt1, &phyCnt2);
+
if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK)) {
struct ar5416AniState *aniState = ah->curani;
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
