diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-09-16 15:12:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:32:11 -0800 |
| commit | 70b1988e97049aa3082b9a3076995d49296ad85d (patch) | |
| tree | 0abd476b86627ff059355a0d554d972f88290039 /net | |
| parent | b7f99ffb34ae3cf228540c683f4bd05a88d46d37 (diff) | |
| download | linux-3.10-70b1988e97049aa3082b9a3076995d49296ad85d.tar.gz linux-3.10-70b1988e97049aa3082b9a3076995d49296ad85d.tar.bz2 linux-3.10-70b1988e97049aa3082b9a3076995d49296ad85d.zip | |
mac80211: disable beacon monitor while going offchannel
commit 3bc3c0d748402e8c1f31b8569f5924d25d7b8e30 upstream.
The beacon monitor should be disabled when going off channel
to prevent spurious warnings and triggering connection
deterioration work such as sending probe requests. Re-enable
the beacon monitor once we come back to the home channel.
This patch has fixes for stable kernels [2.6.34+].
Cc: Paul Stewart <pstew@google.com>
Cc: Amod Bodas <amod.bodas@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/offchannel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index d4e83783420..cf5ee305785 100644 --- a/net/mac80211/offchannel.c +++ b/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); } |