aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 953ce9d84ce8..f88300683879 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2103,11 +2103,6 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)
2103 2103
2104static int iwl3945_scan_initiate(struct iwl3945_priv *priv) 2104static int iwl3945_scan_initiate(struct iwl3945_priv *priv)
2105{ 2105{
2106 if (priv->iw_mode == NL80211_IFTYPE_AP) {
2107 IWL_ERROR("APs don't scan.\n");
2108 return 0;
2109 }
2110
2111 if (!iwl3945_is_ready_rf(priv)) { 2106 if (!iwl3945_is_ready_rf(priv)) {
2112 IWL_DEBUG_SCAN("Aborting scan due to not ready.\n"); 2107 IWL_DEBUG_SCAN("Aborting scan due to not ready.\n");
2113 return -EIO; 2108 return -EIO;
@@ -6976,12 +6971,6 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
6976 goto out_unlock; 6971 goto out_unlock;
6977 } 6972 }
6978 6973
6979 if (priv->iw_mode == NL80211_IFTYPE_AP) { /* APs don't scan */
6980 rc = -EIO;
6981 IWL_ERROR("ERROR: APs don't scan\n");
6982 goto out_unlock;
6983 }
6984
6985 /* we don't schedule scan within next_scan_jiffies period */ 6974 /* we don't schedule scan within next_scan_jiffies period */
6986 if (priv->next_scan_jiffies && 6975 if (priv->next_scan_jiffies &&
6987 time_after(priv->next_scan_jiffies, jiffies)) { 6976 time_after(priv->next_scan_jiffies, jiffies)) {