From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 5 Jun 2008 20:07:52 +0000 (+0000)
Subject: [packages] utils/collectd: Updated wireless compatibility patch to support more drivers
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=40af95423f07a263dbdddcbf469eeaa3b65a5268;p=packages.git

[packages] utils/collectd: Updated wireless compatibility patch to support more drivers


git-svn-id: svn://svn.openwrt.org/openwrt/packages@11371 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/collectd/patches/200-wireless-brcm2.4-compat.patch b/utils/collectd/patches/200-wireless-brcm2.4-compat.patch
deleted file mode 100644
index 064b75dc8..000000000
--- a/utils/collectd/patches/200-wireless-brcm2.4-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- collectd-4.4.0.orig/src/wireless.c	2008-05-26 20:13:05.000000000 +0200
-+++ collectd-4.4.0/src/wireless.c	2008-05-26 20:15:16.000000000 +0200
-@@ -128,7 +128,9 @@
- 			power = 1.0; /* invalid */
- 		else if ((power >= 0.0) && (power <= 100.0))
- 			power = wireless_percent_to_power (power);
--		else if (power > 100.0)
-+		else if ((power > 100.0) && (power <= 256.0))
-+			power = power - 256.0;
-+		else
- 			power = 1.0; /* invalid */
- 
- 		/* noise [dBm] < 0.0 */
-@@ -137,7 +139,9 @@
- 			noise = 1.0; /* invalid */
- 		else if ((noise >= 0.0) && (noise <= 100.0))
- 			noise = wireless_percent_to_power (noise);
--		else if (noise > 100.0)
-+		else if ((noise > 100.0) && (noise <= 256.0))
-+			noise = noise - 256.0;
-+		else
- 			noise = 1.0; /* invalid */
- 
- 		wireless_submit (device, "signal_quality", quality);
diff --git a/utils/collectd/patches/200-wireless-compat.patch b/utils/collectd/patches/200-wireless-compat.patch
new file mode 100644
index 000000000..72fe43fd1
--- /dev/null
+++ b/utils/collectd/patches/200-wireless-compat.patch
@@ -0,0 +1,26 @@
+Index: collectd-4.4.0/src/wireless.c
+===================================================================
+--- collectd-4.4.0.orig/src/wireless.c	2008-06-05 21:47:01.000000000 +0200
++++ collectd-4.4.0/src/wireless.c	2008-06-05 21:48:33.000000000 +0200
+@@ -128,7 +128,9 @@
+ 			power = 1.0; /* invalid */
+ 		else if ((power >= 0.0) && (power <= 100.0))
+ 			power = wireless_percent_to_power (power);
+-		else if (power > 100.0)
++		else if ((power > 100.0) && (power <= 256.0))
++			power = power - 256.0;
++		else if (power > 0.0)
+ 			power = 1.0; /* invalid */
+ 
+ 		/* noise [dBm] < 0.0 */
+@@ -137,7 +139,9 @@
+ 			noise = 1.0; /* invalid */
+ 		else if ((noise >= 0.0) && (noise <= 100.0))
+ 			noise = wireless_percent_to_power (noise);
+-		else if (noise > 100.0)
++		else if ((noise > 100.0) && (noise <= 256.0))
++			noise = noise - 256.0;
++		else if (noise > 0.0)
+ 			noise = 1.0; /* invalid */
+ 
+ 		wireless_submit (device, "signal_quality", quality);