Commit 9e7d1a44 authored by Eric Sandeen's avatar Eric Sandeen Committed by David S. Miller

iwlwifi: correct math in elapsed_jiffies

w/o the first change: if end == start you get MAX_JIFFY_OFFSET which
isn't what you want...

For the latter I think to be technically correct you need the +1 to
account for the jiffy between MAX_JIFFY_OFFSET and 0

(hmm w/ the 2nd change the first isn't strictly needed... ah well)
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 303d9bf6
...@@ -246,10 +246,10 @@ static inline int iwl_check_bits(unsigned long field, unsigned long mask) ...@@ -246,10 +246,10 @@ static inline int iwl_check_bits(unsigned long field, unsigned long mask)
static inline unsigned long elapsed_jiffies(unsigned long start, static inline unsigned long elapsed_jiffies(unsigned long start,
unsigned long end) unsigned long end)
{ {
if (end > start) if (end >= start)
return end - start; return end - start;
return end + (MAX_JIFFY_OFFSET - start); return end + (MAX_JIFFY_OFFSET - start) + 1;
} }
static inline u8 iwl_get_dma_hi_address(dma_addr_t addr) static inline u8 iwl_get_dma_hi_address(dma_addr_t addr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment