From 94894af579edf4290393550405cff257cdca4c2c Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Fri, 12 Nov 2010 08:47:07 +0100
Subject: [PATCH] --- yaml --- r: 224587 b: refs/heads/master c:
 ef1b21f7eb074a8c8ddfea70ed70e988545c8d54 h: refs/heads/master i:   224585:
 f3097908f74edbba8a8135444f9dab5f324725e7   224583:
 9a5443a9286a6498778006d1d7a5a95607b8fad0 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 ---------
 trunk/drivers/net/wireless/iwlwifi/iwl-scan.c    | 3 +--
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 2742ed835853..10578898542c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f3876f09ccf1f2819aee6caee9266b2c4b1622
+refs/heads/master: ef1b21f7eb074a8c8ddfea70ed70e988545c8d54
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h b/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 1aaef70deaec..923368304153 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -44,15 +44,6 @@ static inline struct ieee80211_conf *ieee80211_get_hw_conf(
 	return &hw->conf;
 }
 
-static inline unsigned long elapsed_jiffies(unsigned long start,
-					    unsigned long end)
-{
-	if (end >= start)
-		return end - start;
-
-	return end + (MAX_JIFFY_OFFSET - start) + 1;
-}
-
 /**
  * iwl_queue_inc_wrap - increment queue index, wrap back to beginning
  * @index -- current index
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
index e1aa0e1daa5a..12d9363d0afe 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -252,8 +252,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
 
 	IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
 		       (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
-		       jiffies_to_msecs(elapsed_jiffies
-					(priv->scan_start, jiffies)));
+		       jiffies_to_msecs(jiffies - priv->scan_start));
 
 	queue_work(priv->workqueue, &priv->scan_completed);