aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2013-04-30 13:32:11 -0700
committerDan Williams <dcbw@redhat.com>2013-04-30 16:59:09 -0500
commit32d6dda859ec599340ddd58f2b26e8d8769952f8 (patch)
tree8cbb84cc6a7a26ff5aa8fa6119163da31e8d31f6 /src
parent862eaf4d584037cc44ad662b60a131ec04a972f0 (diff)
broadband-modem: update signal quality normalization
This patch updates normalize_ciev_cind_signal_quality() in MMBroadbandModem to remove an unnecessary check on 'quality >= 0' and also makes sure the normalized signal quality is capped at 100 when no maximum is specified. This is revised from a patch originally authored by Yunlian Jiang <yunlian@chromium.org>. Bug reported on https://code.google.com/p/chromium/issues/detail?id=235989
Diffstat (limited to 'src')
-rw-r--r--src/mm-broadband-modem.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 764b4ed0..45d9027a 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -1651,11 +1651,10 @@ normalize_ciev_cind_signal_quality (guint quality,
guint min,
guint max)
{
- if (!max &&
- quality >= 0) {
+ if (!max) {
/* If we didn't get a max, assume it was 5. Note that we do allow
* 0, meaning no signal at all. */
- return (quality * 20);
+ return (quality <= 5) ? (quality * 20) : 100;
}
if (quality >= min &&