---

yaml --- r: 133990 b: refs/heads/master c: 7cbf0ba h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · ebe7312 · ebe7312
1 parent 46782ae
commit ebe7312
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: a97b77b90decf27a86ac40ea53a741ffb5ead21a
+refs/heads/master: 7cbf0ba5193d1f3bb3caaa06668e22bc86776e41
diff --git 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) {