CHROMIUMOS: mac80211: disable beacon monitor while going offchannel

chromeos/compat-wireless/net/mac80211/offchannel.c

 /*
  * Off-channel operation helpers
  *
  * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi>
  * Copyright 2004, Instant802 Networks, Inc.
  * Copyright 2005, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2009       Johannes Berg <johannes@sipsolutions.net>
  *
@@ skipping 11 matching lines @@
 static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
         local->offchannel_ps_enabled = false;
 
         /* FIXME: what to do when local->pspolling is true? */
 
         del_timer_sync(&local->dynamic_ps_timer);
+        del_timer_sync(&ifmgd->bcn_mon_timer);
         del_timer_sync(&ifmgd->conn_mon_timer);
 
         cancel_work_sync(&local->dynamic_ps_enable_work);
 
         if (local->hw.conf.flags & IEEE80211_CONF_PS) {
                 local->offchannel_ps_enabled = true;
                 local->hw.conf.flags &= ~IEEE80211_CONF_PS;
                 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
         }
 
@@ skipping 40 matching lines @@
                  * If IEEE80211_CONF_PS was not set and the dynamic_ps_timer
                  * had been running before leaving the operating channel,
                  * restart the timer now and send a nullfunc frame to inform
                  * the AP that we are awake.
                  */
                 ieee80211_send_nullfunc(local, sdata, 0);
                 mod_timer(&local->dynamic_ps_timer, jiffies +
                           msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
         }
 
+        ieee80211_sta_reset_beacon_monitor(sdata);
         ieee80211_sta_reset_conn_monitor(sdata);
 }
 
 void ieee80211_offchannel_stop_beaconing(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
 
         mutex_lock(&local->iflist_mtx);
         list_for_each_entry(sdata, &local->interfaces, list) {
                 if (!ieee80211_sdata_running(sdata))
@@ skipping 64 matching lines @@
                 /* re-enable beaconing */
                 if (enable_beaconing &&
                     (sdata->vif.type == NL80211_IFTYPE_AP ||
                      sdata->vif.type == NL80211_IFTYPE_ADHOC ||
                      sdata->vif.type == NL80211_IFTYPE_MESH_POINT))
                         ieee80211_bss_info_change_notify(
                                 sdata, BSS_CHANGED_BEACON_ENABLED);
         }
         mutex_unlock(&local->iflist_mtx);
 }