aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-04-06 07:12:40 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-04-16 16:47:12 -0400
commitb165cf09c0248262232c7566df5ae40284cee7d6 (patch)
treee3b08202438a0b47aeb635601f710be6f47a337e /drivers/net/wireless/iwlwifi/iwl-scan.c
parent92ae80eec7ac642f249b7a2fc02f41441d128a62 (diff)
iwlwifi: remove scan_pass_start
Since we no longer do a multi-pass scan, keeping track of how long each pass took is pointless since there will only be one. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index e45b49ada9fa..cb3601dabf29 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -218,10 +218,10 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
218 /* The HW is no longer scanning */ 218 /* The HW is no longer scanning */
219 clear_bit(STATUS_SCAN_HW, &priv->status); 219 clear_bit(STATUS_SCAN_HW, &priv->status);
220 220
221 IWL_DEBUG_INFO(priv, "Scan pass on %sGHz took %dms\n", 221 IWL_DEBUG_INFO(priv, "Scan on %sGHz took %dms\n",
222 (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2", 222 (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
223 jiffies_to_msecs(elapsed_jiffies 223 jiffies_to_msecs(elapsed_jiffies
224 (priv->scan_pass_start, jiffies))); 224 (priv->scan_start, jiffies)));
225 225
226 /* 226 /*
227 * If a request to abort was given, or the scan did not succeed 227 * If a request to abort was given, or the scan did not succeed
@@ -235,9 +235,6 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
235 235
236 clear_bit(STATUS_SCANNING, &priv->status); 236 clear_bit(STATUS_SCANNING, &priv->status);
237 237
238 IWL_DEBUG_INFO(priv, "Scan took %dms\n",
239 jiffies_to_msecs(elapsed_jiffies(priv->scan_start, jiffies)));
240
241 queue_work(priv->workqueue, &priv->scan_completed); 238 queue_work(priv->workqueue, &priv->scan_completed);
242} 239}
243 240
@@ -449,7 +446,6 @@ static int iwl_scan_initiate(struct iwl_priv *priv)
449 set_bit(STATUS_SCANNING, &priv->status); 446 set_bit(STATUS_SCANNING, &priv->status);
450 priv->is_internal_short_scan = false; 447 priv->is_internal_short_scan = false;
451 priv->scan_start = jiffies; 448 priv->scan_start = jiffies;
452 priv->scan_pass_start = priv->scan_start;
453 449
454 queue_work(priv->workqueue, &priv->request_scan); 450 queue_work(priv->workqueue, &priv->request_scan);
455 451