iwlwifi: apply settings when finishing scan
authorStanislaw Gruszka <sgruszka@redhat.com>
Mon, 13 Sep 2010 12:46:45 +0000 (14:46 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 14 Sep 2010 20:14:26 +0000 (16:14 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-scan.c

index 65b7cb4..599573f 100644 (file)
@@ -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;