From db9b923e2fdb1c7c29df400b86488bc6643c244d Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Fri, 17 Sep 2010 22:22:50 +0200 Subject: [PATCH] --- yaml --- r: 214731 b: refs/heads/master c: e278c5a90368408bd191743e7c6f978f068f4b8d h: refs/heads/master i: 214729: 496522db9270780b3d637f41c1110542dde24edc 214727: e3df86f6d66f0e1b60d29f37e1b72cdf22aba5a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/carl9170/phy.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2512f491a5bd..eb860dd371a3 100644 --- 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 index fe265e3e6ac4..7df8f711f5d8 100644 --- 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)