On Fri, 2010-09-10 at 07:26 -0700, Stanislaw Gruszka wrote: > 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@xxxxxxxxxx> Acked-by: Wey-Yi W Guy <wey-yi.w.guy@xxxxxxxxx> > --- > 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 65b7cb4..599573f 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; -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html