Commit 3f8a9e76 authored Jun 20, 2012 by Johannes Berg

iwlwifi: fix radio reset scan dwell vs. quiet time



My previous commit to shorten the radio reset time
caused issues as the firmware checks the active
dwell time against the quiet time, asserting that
the dwell is >= quiet time. This isn't really
needed in case of passive scanning like here, but
of course we need to pass that check.

To fix this, override the quiet time to be the
same as the radio reset dwell time.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 8d40f4ee

drivers/net/wireless/iwlwifi/dvm/scan.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -720,6 +720,12 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif)
		switch (priv->scan_type) {
		case IWL_SCAN_RADIO_RESET:
		IWL_DEBUG_SCAN(priv, "Start internal passive scan.\n");
		/*
		* Override quiet time as firmware checks that active
		* dwell is >= quiet; since we use passive scan it'll
		* not actually be used.
		*/
		scan->quiet_time = cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
		break;
		case IWL_SCAN_NORMAL:
		if (priv->scan_request->n_ssids) {