From 44eda52f39680a85477187ddae5a402ca2e9163f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 5 Dec 2012 09:49:14 +0100
Subject: [PATCH] --- yaml --- r: 342139 b: refs/heads/master c:
 0b7dff4faed07f55be2a98dd0eafc02623174236 h: refs/heads/master i:   342137:
 40da9921c1a2640fd1bdf371a6dd5a57aea90958   342135:
 b8d58e93d9ef399f5d69d20cc6b4552c518a6e7a v: v3

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

diff --git a/[refs] b/[refs]
index e08367ee5885..c645780dfddc 100644
--- 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
index 40c36d5d7377..09a80b55cf5a 100644
--- 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