---

yaml --- r: 81828 b: refs/heads/master c: 9e7d1a4 h: refs/heads/master v: v3
git-mirror · Feb 1, 2008 · 1b35221 · 1b35221
1 parent c63197f
commit 1b35221
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)