evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: remove scan_pass_start

Browse source 
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>
This commit is contained in:
Johannes Berg 2010-04-06 04:12:40 -07:00 • committed by Reinette Chatre
parent 92ae80eec7
commit b165cf09c0
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-dev.h
View file

@ -1050,7 +1050,6 @@ struct iwl_priv {
/* Scan related variables */ /* Scan related variables */
unsigned long scan_start; unsigned long scan_start;
unsigned long scan_pass_start;
unsigned long scan_start_tsf; unsigned long scan_start_tsf;
void *scan; void *scan;
enum ieee80211_band scan_band; enum ieee80211_band scan_band;

8
drivers/net/wireless/iwlwifi/iwl-scan.c
View file

@ -218,10 +218,10 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
/* The HW is no longer scanning */ /* The HW is no longer scanning */
clear_bit(STATUS_SCAN_HW, &priv->status); 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", (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
jiffies_to_msecs(elapsed_jiffies 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 * 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,
clear_bit(STATUS_SCANNING, &priv->status); 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); queue_work(priv->workqueue, &priv->scan_completed);
} }
@ -449,7 +446,6 @@ static int iwl_scan_initiate(struct iwl_priv *priv)
set_bit(STATUS_SCANNING, &priv->status); set_bit(STATUS_SCANNING, &priv->status);
priv->is_internal_short_scan = false; priv->is_internal_short_scan = false;
priv->scan_start = jiffies; priv->scan_start = jiffies;
priv->scan_pass_start = priv->scan_start;
queue_work(priv->workqueue, &priv->request_scan); queue_work(priv->workqueue, &priv->request_scan);