diff options
| author | Tomas Winkler | 2008-09-24 07:57:46 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-09-24 22:18:04 +0200 |
| commit | 8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b (patch) | |
| tree | 4e98dfc3181fb2feebc37de9b2d61451797b72e0 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | iwlagn: downgrade BUG_ON in interrupt (diff) | |
| download | kernel-qcow2-linux-8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b.tar.gz kernel-qcow2-linux-8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b.tar.xz kernel-qcow2-linux-8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b.zip | |
iwlwifi: don't fail if scan is issued too early
This patch returns success and empty scan on scans requests that were
rejected because issued too early. The cached bss list from previous
scanning will be returned by mac80211.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 09c264be0496..bf855c35b0c1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -463,11 +463,6 @@ void iwl_init_scan_params(struct iwl_priv *priv) int iwl_scan_initiate(struct iwl_priv *priv) { - if (priv->iw_mode == NL80211_IFTYPE_AP) { - IWL_ERROR("APs don't scan.\n"); - return 0; - } - if (!iwl_is_ready_rf(priv)) { IWL_DEBUG_SCAN("Aborting scan due to not ready.\n"); return -EIO; @@ -479,8 +474,7 @@ int iwl_scan_initiate(struct iwl_priv *priv) } if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { - IWL_DEBUG_SCAN("Scan request while abort pending. " - "Queuing.\n"); + IWL_DEBUG_SCAN("Scan request while abort pending\n"); return -EAGAIN; } |