---

yaml --- r: 150639 b: refs/heads/master c: df29ff3 h: refs/heads/master i: 150637: 5b7ac25 150635: e526634 150631: f23c62e 150623: e0f0308 v: v3
git-mirror · Jun 3, 2009 · 0496213 · 0496213
1 parent e7b4e10
commit 0496213
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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;