lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: correct math in elapsed_jiffies

Browse Source 
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: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Sandeen
2008-01-24 15:47:39 -05:00
committed by David S. Miller
parent 303d9bf6bb
commit 9e7d1a445e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-helpers.h
View File

@@ -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)