From 1b35221d493116f69933f3f40303c279b7b25b9a Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 24 Jan 2008 15:47:39 -0500 Subject: [PATCH] --- yaml --- r: 81828 b: refs/heads/master c: 9e7d1a445ed0d5c1d8863945d6c4c6f018a4aa83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cdd75cbfc09b..05ee7fedbf0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 303d9bf6bb64ead8e3f1d7e29904a4025502e591 +refs/heads/master: 9e7d1a445ed0d5c1d8863945d6c4c6f018a4aa83 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h b/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h index cd2eb1848310..cb009f4c401f 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-helpers.h @@ -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, unsigned long end) { - if (end > start) + if (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)