CHROMIUMOS: ath9k: fix enabling ANI / tx monitor after bg scan

chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/main.c

 /*
  * Copyright (c) 2008-2009 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ skipping 236 matching lines @@
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to restart recv logic\n");
                 r = -EIO;
                 goto ps_restore;
         }
 
         ath_cache_conf_rate(sc, &hw->conf);
         ath_update_txpow(sc);
         ath9k_hw_set_interrupts(ah, ah->imask);
 
-        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL | SC_OP_SCANNING))) {
+        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL))) {
+                ath_beacon_config(sc, NULL);
+                ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
                 ath_start_ani(common);
-                ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
         }
 
-        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)))
-                ath_beacon_config(sc, NULL);
-
  ps_restore:
         ath9k_ps_restore(sc);
         return r;
 }
 
 static void ath_paprd_activate(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath9k_hw_cal_data *caldata = ah->caldata;
         int chain;
@@ skipping 1755 matching lines @@
                  * After mac80211 fixes we will not have configured hardware
                  * to the home channel nor would we have configured the RX
                  * filter yet.
                  */
                 mutex_unlock(&sc->mutex);
                 return;
         }
 
         aphy->state = ATH_WIPHY_SCAN;
         ath9k_wiphy_pause_all_forced(sc, aphy);
-        sc->sc_flags |= SC_OP_SCANNING;
         mutex_unlock(&sc->mutex);
 }
 
 /*
  * XXX: this requires a revisit after the driver
  * scan_complete gets moved to another place/removed in mac80211.
  */
 static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
 {
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         aphy->state = ATH_WIPHY_ACTIVE;
-        sc->sc_flags &= ~SC_OP_SCANNING;
         mutex_unlock(&sc->mutex);
 }
 
 static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
 {
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
         struct ath_hw *ah = sc->sc_ah;
 
         mutex_lock(&sc->mutex);
@@ skipping 18 matching lines @@
         .get_tsf            = ath9k_get_tsf,
         .set_tsf            = ath9k_set_tsf,
         .reset_tsf          = ath9k_reset_tsf,
         .ampdu_action       = ath9k_ampdu_action,
         .get_survey         = ath9k_get_survey,
         .sw_scan_start      = ath9k_sw_scan_start,
         .sw_scan_complete   = ath9k_sw_scan_complete,
         .rfkill_poll        = ath9k_rfkill_poll_state,
         .set_coverage_class = ath9k_set_coverage_class,
 };