---

yaml --- r: 214731 b: refs/heads/master c: e278c5a h: refs/heads/master i: 214729: 496522d 214727: e3df86f v: v3
git-mirror · Sep 21, 2010 · db9b923 · db9b923
1 parent 7d9b5d7
commit db9b923
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: 9dec6f9c48242eec742c9475f32eeef29448701c
+refs/heads/master: e278c5a90368408bd191743e7c6f978f068f4b8d
diff --git a/trunk/drivers/net/wireless/ath/carl9170/phy.c b/trunk/drivers/net/wireless/ath/carl9170/phy.c
@@ -1558,9 +1558,9 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
 static int carl9170_calc_noise_dbm(u32 raw_noise)
 {
 	if (raw_noise & 0x100)
-		return ~((raw_noise & 0x0ff) >> 1);
+		return ~0x1ff | raw_noise;
 	else
-		return (raw_noise & 0xff) >> 1;
+		return raw_noise;
 }
 
 int carl9170_get_noisefloor(struct ar9170 *ar)