summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-11-12 08:47:07 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-11-16 16:39:09 -0500
commitef1b21f7eb074a8c8ddfea70ed70e988545c8d54 (patch)
tree11cde08cd9de612f5fee371d618b6cd9dc449fc5 /drivers/net/wireless/iwlwifi/iwl-scan.c
parent70f3876f09ccf1f2819aee6caee9266b2c4b1622 (diff)
downloadblackbird-op-linux-ef1b21f7eb074a8c8ddfea70ed70e988545c8d54.tar.gz
blackbird-op-linux-ef1b21f7eb074a8c8ddfea70ed70e988545c8d54.zip
iwlwifi: kill elapsed_jiffies
Subtract of jiffies is fine even if one variable overwrap. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index e1aa0e1daa5a..12d9363d0afe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/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);
OpenPOWER on IntegriCloud