From ebe7312ae317c19c5aa5bf508a5012394afb4e2d Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <vivek.natraj@gmail.com>
Date: Wed, 24 Dec 2008 00:34:37 -0800
Subject: [PATCH] --- yaml --- r: 133990 b: refs/heads/master c:
 7cbf0ba5193d1f3bb3caaa06668e22bc86776e41 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a9a7cc9d9d13..faa2d7454e90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a97b77b90decf27a86ac40ea53a741ffb5ead21a
+refs/heads/master: 7cbf0ba5193d1f3bb3caaa06668e22bc86776e41
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 1eefc5df4954..8e0e3303ca8c 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/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) {