1 files changed, 59 insertions, 14 deletions

diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index 91650fe50461..d4549e9aac5c 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -50,8 +50,7 @@ void ath_tx_complete_poll_work(struct work_struct *work)
         if (needreset) {
                 ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
                         "tx hung, resetting the chip\n");
-                RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
-                ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                ath9k_queue_reset(sc, RESET_TYPE_TX_HANG);
                 return;
         }
 
@@ -69,6 +68,7 @@ void ath_hw_check(struct work_struct *work)
         unsigned long flags;
         int busy;
         u8 is_alive, nbeacon = 1;
+        enum ath_reset_type type;
 
         ath9k_ps_wakeup(sc);
         is_alive = ath9k_hw_check_alive(sc->sc_ah);
@@ -78,7 +78,7 @@ void ath_hw_check(struct work_struct *work)
         else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
                 ath_dbg(common, RESET,
                         "DCU stuck is detected. Schedule chip reset\n");
-                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
+                type = RESET_TYPE_MAC_HANG;
                 goto sched_reset;
         }
 
@@ -90,7 +90,7 @@ void ath_hw_check(struct work_struct *work)
                 busy, sc->hw_busy_count + 1);
         if (busy >= 99) {
                 if (++sc->hw_busy_count >= 3) {
-                        RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
+                        type = RESET_TYPE_BB_HANG;
                         goto sched_reset;
                 }
         } else if (busy >= 0) {
@@ -102,7 +102,7 @@ void ath_hw_check(struct work_struct *work)
         goto out;
 
 sched_reset:
-        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+        ath9k_queue_reset(sc, type);
 out:
         ath9k_ps_restore(sc);
 }
@@ -119,8 +119,7 @@ static bool ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
                 count++;
                 if (count == 3) {
                         ath_dbg(common, RESET, "PLL WAR, resetting the chip\n");
-                        RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
-                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                        ath9k_queue_reset(sc, RESET_TYPE_PLL_HANG);
                         count = 0;
                         return true;
                 }
@@ -432,26 +431,72 @@ set_timer:
         }
 }
 
-void ath_start_ani(struct ath_common *common)
+void ath_start_ani(struct ath_softc *sc)
 {
-        struct ath_hw *ah = common->ah;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
         unsigned long timestamp = jiffies_to_msecs(jiffies);
-        struct ath_softc *sc = (struct ath_softc *) common->priv;
-
-        if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags))
-                return;
 
-        if (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+        if (common->disable_ani ||
+            !test_bit(SC_OP_ANI_RUN, &sc->sc_flags) ||
+            (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
                 return;
 
         common->ani.longcal_timer = timestamp;
         common->ani.shortcal_timer = timestamp;
         common->ani.checkani_timer = timestamp;
 
+        ath_dbg(common, ANI, "Starting ANI\n");
         mod_timer(&common->ani.timer,
                   jiffies + msecs_to_jiffies((u32)ah->config.ani_poll_interval));
 }
 
+void ath_stop_ani(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        ath_dbg(common, ANI, "Stopping ANI\n");
+        del_timer_sync(&common->ani.timer);
+}
+
+void ath_check_ani(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
+
+        /*
+         * Check for the various conditions in which ANI has to
+         * be stopped.
+         */
+        if (ah->opmode == NL80211_IFTYPE_ADHOC) {
+                if (!cur_conf->enable_beacon)
+                        goto stop_ani;
+        } else if (ah->opmode == NL80211_IFTYPE_AP) {
+                if (!cur_conf->enable_beacon) {
+                        /*
+                         * Disable ANI only when there are no
+                         * associated stations.
+                         */
+                        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
+                                goto stop_ani;
+                }
+        } else if (ah->opmode == NL80211_IFTYPE_STATION) {
+                if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
+                        goto stop_ani;
+        }
+
+        if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags)) {
+                set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
+                ath_start_ani(sc);
+        }
+
+        return;
+
+stop_ani:
+        clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
+        ath_stop_ani(sc);
+}
+
 void ath_update_survey_nf(struct ath_softc *sc, int channel)
 {
         struct ath_hw *ah = sc->sc_ah;