From 6cd8e09b882fbbd74179f25642d7c57aa61640a9 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 16 Sep 2010 15:12:31 -0400 Subject: [PATCH] --- yaml --- r: 214695 b: refs/heads/master c: 4730d5977f3e12b828d354f7752cffd94bdf39e5 h: refs/heads/master i: 214693: 2659a5e0c0efc813994536c4d1a273344d203455 214691: 404420b02ceb04913e946d9ac3f47dfdfd71ab85 214687: 0678b7e1b2a786bf5c0cf4d17d534dae4f636d03 v: v3 --- [refs] | 2 +- trunk/net/mac80211/offchannel.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d310dbe65241..39ebb7b6b751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c699c3a75d4e8d0d2c317f83048d8fd3ffe692a +refs/heads/master: 4730d5977f3e12b828d354f7752cffd94bdf39e5 diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c index eeacaa59380a..627a33ef84c4 100644 --- a/trunk/net/mac80211/offchannel.c +++ b/trunk/net/mac80211/offchannel.c @@ -22,12 +22,15 @@ 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->conn_mon_timer); + cancel_work_sync(&local->dynamic_ps_enable_work); if (local->hw.conf.flags & IEEE80211_CONF_PS) { @@ -85,6 +88,8 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata) mod_timer(&local->dynamic_ps_timer, jiffies + msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); } + + ieee80211_sta_reset_conn_monitor(sdata); } void ieee80211_offchannel_stop_beaconing(struct ieee80211_local *local)