iwlwifi: apply settings when finishing scan

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 <[email protected]>
Acked-by: Wey-Yi W Guy <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 65b7cb4290cbaa162f1848885633d9d21279e1d0..599573f2b01fce40904e9855cbd37d7fa0d2f9d5 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -573,7 +573,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
 
        if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) {
                IWL_DEBUG_SCAN(priv, "Scan already completed.\n");
-               goto out;
+               goto out_settings;
        }
 
        if (priv->is_internal_short_scan && !aborted) {
@@ -599,6 +599,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
 out_complete:
        iwl_complete_scan(priv, aborted);
 
+out_settings:
        /* Can we still talk to firmware ? */
        if (!iwl_is_ready_rf(priv))
                goto out;