---

yaml --- r: 223619 b: refs/heads/master c: 8808f64 h: refs/heads/master i: 223617: ebfec2f 223615: 9ad19a9 v: v3
git-mirror · Dec 13, 2010 · bf31114 · bf31114
1 parent 3fd6577
commit bf31114
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16cad7fba037b34ca32cc0adac65bc089d969fb8
+refs/heads/master: 8808f64171deec62346888e156e3adb636e2a31a
diff --git a/trunk/net/mac80211/work.c b/trunk/net/mac80211/work.c
@@ -1051,19 +1051,22 @@ void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
 {
 	struct ieee80211_local *local = sdata->local;
 	struct ieee80211_work *wk;
+	bool cleanup = false;
 
 	mutex_lock(&local->mtx);
 	list_for_each_entry(wk, &local->work_list, list) {
 		if (wk->sdata != sdata)
 			continue;
+		cleanup = true;
 		wk->type = IEEE80211_WORK_ABORT;
 		wk->started = true;
 		wk->timeout = jiffies;
 	}
 	mutex_unlock(&local->mtx);
 
 	/* run cleanups etc. */
-	ieee80211_work_work(&local->work_work);
+	if (cleanup)
+		ieee80211_work_work(&local->work_work);
 
 	mutex_lock(&local->mtx);
 	list_for_each_entry(wk, &local->work_list, list) {