From 04962131c23297ea823c65969dfc0b9c8a9a5df5 Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 22 May 2009 14:37:54 -0700
Subject: [PATCH] --- yaml --- r: 150639 b: refs/heads/master c:
 df29ff379425954cb74b7beb642ca5b43ae557ae h: refs/heads/master i:   150637:
 5b7ac254bf8ed4e5fb77497892b09da20fd62acc   150635:
 e526634f46a8bae0809fbee66b265df0b561ce60   150631:
 f23c62e8d0cfaf40e85f945eed7eba47cdd2f464   150623:
 e0f030801a006a5bf88a9284450c0b161ec33f5b v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f0dd6ba39df3..75fd57054573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce2ebc9b8ddac020aa06c83a6d084c34017d835d
+refs/heads/master: df29ff379425954cb74b7beb642ca5b43ae557ae
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
index e93ddb74457e..a9da06f6f844 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2685,13 +2685,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
 	if (!iwl_is_ready_rf(priv))
 		return -EAGAIN;
 
-	cancel_delayed_work(&priv->scan_check);
-	if (iwl_scan_cancel_timeout(priv, 100)) {
-		IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
-		IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
-		return -EAGAIN;
-	}
-
 	iwlcore_commit_rxon(priv);
 
 	return 0;