Commit 951891c7 authored Oct 23, 2008 by Mohamed Abbas Committed by John W. Linville Oct 31, 2008

iwlwifi: clear scanning bits upon failure



In iwl_bg_request_scan function, if we could not send a
scan command it will go to done.
In done it does the right thing to call mac80211 with
scan complete, but the problem is STATUS_SCAN_HW is still
set causing any future scan to fail. Fix by clearing the scanning status
bits if scan fails.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 60d32215

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -834,6 +834,13 @@ static void iwl_bg_request_scan(struct work_struct *data)
		return;

		done:
		/* Cannot perform scan. Make sure we clear scanning
		* bits from status so next scan request can be performed.
		* If we don't clear scanning status bit here all next scan
		* will fail
		*/
		clear_bit(STATUS_SCAN_HW, &priv->status);
		clear_bit(STATUS_SCANNING, &priv->status);
		/* inform mac80211 scan aborted */
		queue_work(priv->workqueue, &priv->scan_completed);
		mutex_unlock(&priv->mutex);