Skip to content

Commit

Permalink
iwlwifi: remove scan_pass_start
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and Reinette Chatre committed Apr 16, 2010
1 parent 92ae80e commit b165cf0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/net/wireless/iwlwifi/iwl-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,6 @@ struct iwl_priv {

/* Scan related variables */
unsigned long scan_start;
unsigned long scan_pass_start;
unsigned long scan_start_tsf;
void *scan;
enum ieee80211_band scan_band;
Expand Down
8 changes: 2 additions & 6 deletions drivers/net/wireless/iwlwifi/iwl-scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
/* The HW is no longer scanning */
clear_bit(STATUS_SCAN_HW, &priv->status);

IWL_DEBUG_INFO(priv, "Scan pass on %sGHz took %dms\n",
IWL_DEBUG_INFO(priv, "Scan on %sGHz took %dms\n",
(priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
jiffies_to_msecs(elapsed_jiffies
(priv->scan_pass_start, jiffies)));
(priv->scan_start, jiffies)));

/*
* If a request to abort was given, or the scan did not succeed
Expand All @@ -235,9 +235,6 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,

clear_bit(STATUS_SCANNING, &priv->status);

IWL_DEBUG_INFO(priv, "Scan took %dms\n",
jiffies_to_msecs(elapsed_jiffies(priv->scan_start, jiffies)));

queue_work(priv->workqueue, &priv->scan_completed);
}

Expand Down Expand Up @@ -449,7 +446,6 @@ static int iwl_scan_initiate(struct iwl_priv *priv)
set_bit(STATUS_SCANNING, &priv->status);
priv->is_internal_short_scan = false;
priv->scan_start = jiffies;
priv->scan_pass_start = priv->scan_start;

queue_work(priv->workqueue, &priv->request_scan);

Expand Down

0 comments on commit b165cf0

Please sign in to comment.