CHROMIUMOS: mac80211: disable beacon monitor while going offchannel

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

Index: chromeos/compat-wireless/net/mac80211/offchannel.c
diff --git a/chromeos/compat-wireless/net/mac80211/offchannel.c b/chromeos/compat-wireless/net/mac80211/offchannel.c
index d4e837834209a172c8321f5f184380fe72a1a0c3..cf5ee305785b68ad6a49dbfd8c6013024db1c7d8 100644
--- a/chromeos/compat-wireless/net/mac80211/offchannel.c
+++ b/chromeos/compat-wireless/net/mac80211/offchannel.c
@@ -29,6 +29,7 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata)
 	/* 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);
@@ -89,6 +90,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata)
 			  msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
 	}
 
+	ieee80211_sta_reset_beacon_monitor(sdata);
 	ieee80211_sta_reset_conn_monitor(sdata);
 }