[07/10] mac80211: disable beacon monitor while going offchannel

Commit Message

Luis Rodriguez Sept. 14, 2010, 2:20 p.m. UTC

None

Patch

diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 8b58626..b199136 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -22,12 +22,14 @@ 
 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(&sdata->u.mgd.conn_mon_timer);
 
 	cancel_work_sync(&local->dynamic_ps_enable_work);
@@ -88,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);
 }