---

yaml --- r: 342139 b: refs/heads/master c: 0b7dff4 h: refs/heads/master i: 342137: 40da992 342135: b8d58e9 v: v3
git-mirror · Dec 6, 2012 · 44eda52 · 44eda52
1 parent 1ef9e25
commit 44eda52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01331040e6442ad09181bfaacd8bb9687dce2389
+refs/heads/master: 0b7dff4faed07f55be2a98dd0eafc02623174236
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -862,7 +862,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
 		rcu_assign_pointer(local->p2p_sdata, NULL);
 		/* fall through */
 	default:
-		flush_work(&sdata->work);
+		cancel_work_sync(&sdata->work);
 		/*
 		 * When we get here, the interface is marked down.
 		 * Call rcu_barrier() to wait both for the RX path