Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[deliverable/linux.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index bebc45db9c7a3e6d731b2d2e567c990b17cf07b5..ede5f4959904cd06261354757bd6879fdf6a937f 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -637,6 +637,18 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                ieee80211_configure_filter(local);
                break;
        default:
+               mutex_lock(&local->mtx);
+               if (local->hw_roc_dev == sdata->dev &&
+                   local->hw_roc_channel) {
+                       /* ignore return value since this is racy */
+                       drv_cancel_remain_on_channel(local);
+                       ieee80211_queue_work(&local->hw, &local->hw_roc_done);
+               }
+               mutex_unlock(&local->mtx);
+
+               flush_work(&local->hw_roc_start);
+               flush_work(&local->hw_roc_done);
+
                flush_work(&sdata->work);
                /*
                 * When we get here, the interface is marked down.