From 0b7a360c5dcb522e97976810c101e58cbc6b712b Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 14 Oct 2007 19:51:15 +0200
Subject: [PATCH] --- yaml --- r: 71807 b: refs/heads/master c:
 c899a575fa9cc802a4a77f6c5078b14fc1d12487 h: refs/heads/master i:   71805:
 87d8f8cf90cfa9066ffb018c813c194d05c38ac0   71803:
 5c1de2dd7fe68fd23b70153dd5d546c2402d2f98   71799:
 bd2f3ee6c52faf6ce363300b820e79f18467fdd9   71791:
 c64804f61b2f3c0e2e2960d121e5ec3a4b02b08d   71775:
 46ba10eb053cb72c34df3cd1956c6d247338695a   71743:
 a984f06577a92cd88dcee944eb09f91c43874bc8   71679:
 f5fb02189c1c8c5b98f457738ef436ba4b748d48 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f1e1c1558ace..97abc5d99522 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba8007ceb076f336a453a049cc5353eaa01d7136
+refs/heads/master: c899a575fa9cc802a4a77f6c5078b14fc1d12487
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 7b0c602082b1..acdf5507d3d0 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -4492,13 +4492,13 @@ static u8 ratio2dB[100] = {
  * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
 int iwl_calc_db_from_ratio(int sig_ratio)
 {
-	/* Anything above 1000:1 just report as 60 dB */
-	if (sig_ratio > 1000)
+	/* 1000:1 or higher just report as 60 dB */
+	if (sig_ratio >= 1000)
 		return 60;
 
-	/* Above 100:1, divide by 10 and use table,
+	/* 100:1 or higher, divide by 10 and use table,
 	 *   add 20 dB to make up for divide by 10 */
-	if (sig_ratio > 100)
+	if (sig_ratio >= 100)
 		return (20 + (int)ratio2dB[sig_ratio/10]);
 
 	/* We shouldn't see this */