diff options
| author | Johannes Berg | 2011-09-23 00:14:58 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-09-27 20:34:09 +0200 |
| commit | f253247a944fcf5f48ca434331d9e4f72f5fef8d (patch) | |
| tree | 1a86e468fc87aed6b89f487badce48c93448c1a7 | |
| parent | iwlagn: make iwl_scan_cancel_timeout void (diff) | |
| download | kernel-qcow2-linux-f253247a944fcf5f48ca434331d9e4f72f5fef8d.tar.gz kernel-qcow2-linux-f253247a944fcf5f48ca434331d9e4f72f5fef8d.tar.xz kernel-qcow2-linux-f253247a944fcf5f48ca434331d9e4f72f5fef8d.zip | |
iwlagn: refactor scan complete
We'll need to be able to run scan complete
inline, not from the workqueue, so refactor
it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index d9596ba39b82..30100220ce2b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -1013,18 +1013,14 @@ static void iwl_bg_abort_scan(struct work_struct *work) mutex_unlock(&priv->shrd->mutex); } -static void iwl_bg_scan_completed(struct work_struct *work) +static void iwl_process_scan_complete(struct iwl_priv *priv) { - struct iwl_priv *priv = - container_of(work, struct iwl_priv, scan_completed); bool aborted; IWL_DEBUG_SCAN(priv, "Completed scan.\n"); cancel_delayed_work(&priv->scan_check); - mutex_lock(&priv->shrd->mutex); - aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->shrd->status); if (aborted) IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n"); @@ -1057,7 +1053,7 @@ static void iwl_bg_scan_completed(struct work_struct *work) goto out_complete; } - goto out; + return; } out_complete: @@ -1066,11 +1062,18 @@ out_complete: out_settings: /* Can we still talk to firmware ? */ if (!iwl_is_ready_rf(priv->shrd)) - goto out; + return; iwlagn_post_scan(priv); +} + +static void iwl_bg_scan_completed(struct work_struct *work) +{ + struct iwl_priv *priv = + container_of(work, struct iwl_priv, scan_completed); -out: + mutex_lock(&priv->shrd->mutex); + iwl_process_scan_complete(priv); mutex_unlock(&priv->shrd->mutex); } |