diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-11-12 07:47:07 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-16 21:39:09 (GMT) |
| commit | ef1b21f7eb074a8c8ddfea70ed70e988545c8d54 (patch) | |
| tree | 11cde08cd9de612f5fee371d618b6cd9dc449fc5 /drivers | |
| parent | 70f3876f09ccf1f2819aee6caee9266b2c4b1622 (diff) | |
| download | linux-fsl-qoriq-ef1b21f7eb074a8c8ddfea70ed70e988545c8d54.tar.xz | |
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h index 1aaef70..9233683 100644 --- a/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/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/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index e1aa0e1..12d9363 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); |