summaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorVivek Natarajan <vivek.natraj@gmail.com>2008-12-24 00:34:37 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:58:49 -0500
commit7cbf0ba5193d1f3bb3caaa06668e22bc86776e41 (patch)
tree759a4160513042ba50f6361b7df9330f3c02aa05 /net/mac80211/iface.c
parenta97b77b90decf27a86ac40ea53a741ffb5ead21a (diff)
downloadop-kernel-dev-7cbf0ba5193d1f3bb3caaa06668e22bc86776e41.zip
op-kernel-dev-7cbf0ba5193d1f3bb3caaa06668e22bc86776e41.tar.gz
mac80211: Cancel the power save timer in ieee80211_stop.
Since the station info is flushed before calling set_disassoc in ieee80211_stop, the power save timer is never cancelled when the driver is unloaded. Hence the timer cancellation has to be done in ieee80211_stop itself. Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 1eefc5d..8e0e330 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -383,6 +383,8 @@ static int ieee80211_stop(struct net_device *dev)
atomic_dec(&local->iff_promiscs);
dev_mc_unsync(local->mdev, dev);
+ del_timer_sync(&local->dynamic_ps_timer);
+ cancel_work_sync(&local->dynamic_ps_enable_work);
/* APs need special treatment */
if (sdata->vif.type == NL80211_IFTYPE_AP) {
OpenPOWER on IntegriCloud