diff options
| author | Stanislaw Gruszka | 2010-10-06 11:22:13 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-10-06 22:30:42 +0200 |
| commit | 09be251e9005ebd67e5eabcaad904edb7ecacc55 (patch) | |
| tree | 38b26b541ec16b51cef8fe30528784091480cc9a | |
| parent | mac80211: compete scan to cfg80211 if deferred scan fail to start (diff) | |
| download | kernel-qcow2-linux-09be251e9005ebd67e5eabcaad904edb7ecacc55.tar.gz kernel-qcow2-linux-09be251e9005ebd67e5eabcaad904edb7ecacc55.tar.xz kernel-qcow2-linux-09be251e9005ebd67e5eabcaad904edb7ecacc55.zip | |
Revert "iwlwifi: do not perferm force reset while doing scan"
This reverts commit 7acc7c683a747689aaaaad4fce1683fc3f85e552. It was
applied to avoid possible warning in ieee80211_restart_hw, however
reason of the warning were races in mac80211, currently hopefully fixed.
Not reseting device when performing scan is bad for two reasons.
When forcing reset from iwl_check_stuck_queue(), in case of fail,
reset will be repeated until scan finish. But since firmware is in bad
shape, scan only finish after scan_check work (about 7s). So we will
delay the reset, what is not good behaviour.
When forcing reset from iwl_recover_from_statistics(), we will not
repeat the reset, so we will not perform reset at all when needed.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index b7adcf87280d..3532e1dadf10 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -2737,11 +2737,6 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return -EINVAL; - if (test_bit(STATUS_SCANNING, &priv->status)) { - IWL_DEBUG_INFO(priv, "scan in progress.\n"); - return -EINVAL; - } - if (mode >= IWL_MAX_FORCE_RESET) { IWL_DEBUG_INFO(priv, "invalid reset request.\n"); return -EINVAL; |