From c758d7cd578a7dea3c8b61d3587c7aff63355f13 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 14 Jun 2012 21:22:17 +0200
Subject: [PATCH] --- yaml --- r: 314757 b: refs/heads/master c:
 601968b3bb1176b4cee47faba2d7a104422de8e6 h: refs/heads/master i:   314755:
 a092aea9f88ed9944ec5215e4e33dbe851421fda v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bdb7155b171c..12d1b2045a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dada03ca73b699337781ae36e1ce4c8fec2da40a
+refs/heads/master: 601968b3bb1176b4cee47faba2d7a104422de8e6
diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 9d2374862314..c57726348ffe 100644
--- a/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1036,8 +1036,18 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
 	mutex_lock(&priv->mutex);
 
 	if (test_bit(STATUS_SCAN_HW, &priv->status)) {
-		err = -EBUSY;
-		goto out;
+		/* mac80211 should not scan while ROC or ROC while scanning */
+		if (WARN_ON_ONCE(priv->scan_type != IWL_SCAN_RADIO_RESET)) {
+			err = -EBUSY;
+			goto out;
+		}
+
+		iwl_scan_cancel_timeout(priv, 100);
+
+		if (test_bit(STATUS_SCAN_HW, &priv->status)) {
+			err = -EBUSY;
+			goto out;
+		}
 	}
 
 	priv->hw_roc_channel = channel;