evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: apply settings when finishing scan

Browse source 
Even is someone else complete scanning in mac80211, apply rxon and
tx power settings if gets scan complete notification from hardware.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2010-09-13 14:46:45 +02:00 • committed by John W. Linville
parent 7cf2442129
commit 3a160a5b5f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/iwlwifi/iwl-scan.c
View file

@ -573,7 +573,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) { if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) {
IWL_DEBUG_SCAN(priv, "Scan already completed.\n"); IWL_DEBUG_SCAN(priv, "Scan already completed.\n");
goto out; goto out_settings;
} }
if (priv->is_internal_short_scan && !aborted) { if (priv->is_internal_short_scan && !aborted) {
@ -599,6 +599,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
out_complete: out_complete:
iwl_complete_scan(priv, aborted); iwl_complete_scan(priv, aborted);
out_settings:
/* Can we still talk to firmware ? */ /* Can we still talk to firmware ? */
if (!iwl_is_ready_rf(priv)) if (!iwl_is_ready_rf(priv))
goto out; goto out;