diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-09-13 14:46:45 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:14:26 -0400 |
| commit | 3a160a5b5fc7d45fa2f869b23f8fcd27a4c05f8f (patch) | |
| tree | 477d402e2a27727e66a4e89d875fe7be707fb06d /drivers | |
| parent | 7cf24421292d92556d53630e6973b34324c94103 (diff) | |
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 65b7cb4290c..599573f2b01 100644 --- 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; |