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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index f2d4ca5b132ad58797ccc6902f4987b16205b7e8..a7ffb4f9280a78e2b3d6ca8d2cf4d7591c090583 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -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;

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index e45b49ada9fa29a81a9a0c858878b83fc9849993..cb3601dabf29c0850984373b73b748cdbc64ae31 100644 (file)
--- 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,
        /* 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
@@ -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);
 }
 
@@ -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);