ath9k: Initialize ANI timers

commit 415f738ecf41b427921b503ecfd427e26f89dc23 upstream.

The various ANI timers have to be initialized properly when
starting the calibration timer.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 894daee44fa52f2d240b9a7fba2c6a9440c909e3..bb5312f644f7855926c3ddf2afcd62bc96d9a210 100644 (file)
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -408,6 +408,18 @@ set_timer:
        mod_timer(&sc->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
 }
 
+static void ath_start_ani(struct ath_softc *sc)
+{
+       unsigned long timestamp = jiffies_to_msecs(jiffies);
+
+       sc->ani.longcal_timer = timestamp;
+       sc->ani.shortcal_timer = timestamp;
+       sc->ani.checkani_timer = timestamp;
+
+       mod_timer(&sc->ani.timer,
+                 jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
+}
+
 /*
  * Update tx/rx chainmask. For legacy association,
  * hard code chainmask to 1x1, for 11n association, use
@@ -920,9 +932,7 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                sc->nodestats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER;
                sc->nodestats.ns_avgtxrate = ATH_RATE_DUMMY_MARKER;
 
-               /* Start ANI */
-               mod_timer(&sc->ani.timer,
-                         jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
+               ath_start_ani(sc);
        } else {
                DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISSOC\n");
                sc->curaid = 0;
@@ -2271,12 +2281,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
 
        ath9k_hw_set_interrupts(sc->sc_ah, sc->imask);
 
-       if (conf->type == NL80211_IFTYPE_AP) {
-               /* TODO: is this a suitable place to start ANI for AP mode? */
-               /* Start ANI */
-               mod_timer(&sc->ani.timer,
-                         jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
-       }
+       if (conf->type == NL80211_IFTYPE_AP)
+               ath_start_ani(sc);
 
 out:
        mutex_unlock(&sc->mutex);