---

yaml --- r: 214697 b: refs/heads/master c: 3bc3c0d h: refs/heads/master i: 214695: 6cd8e09 v: v3
git-mirror · Sep 16, 2010 · e47efbc · e47efbc
1 parent d14846f
commit e47efbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3a910a8e4e846b9a767d35483f4dc7c6de7af82
+refs/heads/master: 3bc3c0d748402e8c1f31b8569f5924d25d7b8e30
diff --git a/trunk/net/mac80211/offchannel.c b/trunk/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);
 }