Commit 09be251e authored Oct 06, 2010 by Stanislaw Gruszka Committed by John W. Linville Oct 06, 2010

Revert "iwlwifi: do not perferm force reset while doing scan"



This reverts commit 7acc7c68. 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>

parent 3aed49ef

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2737,11 +2737,6 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)
	if (test_bit(STATUS_EXIT_PENDING, &priv->status))		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
	return -EINVAL;		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) {		if (mode >= IWL_MAX_FORCE_RESET) {
	IWL_DEBUG_INFO(priv, "invalid reset request.\n");		IWL_DEBUG_INFO(priv, "invalid reset request.\n");
	return -EINVAL;		return -EINVAL;