From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 25 Jun 2018 07:33:07 +0000 (+0200)
Subject: luci-mod-admin-full: fix average traffic calculation in realtime bandwidth
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b79982e5df0864a0c3c410c71d3074e7d048ecf9;p=project%2Fluci.git

luci-mod-admin-full: fix average traffic calculation in realtime bandwidth

Fixes #1908.
Suggested-by: "mgalyean"
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index f0ef5e7a2c..b7594bfd45 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -202,18 +202,13 @@
 							data_rx_peak = Math.max(data_rx_peak, data_rx[i]);
 							data_tx_peak = Math.max(data_tx_peak, data_tx[i]);
 
-							if (i > 0)
-							{
-								data_rx_avg = (data_rx_avg + data_rx[i]) / 2;
-								data_tx_avg = (data_tx_avg + data_tx[i]) / 2;
-							}
-							else
-							{
-								data_rx_avg = data_rx[i];
-								data_tx_avg = data_tx[i];
-							}
+							data_rx_avg += data_rx[i];
+							data_tx_avg += data_tx[i];
 						}
 
+						data_rx_avg = (data_rx_avg / Math.max(data_rx.length, 1));
+						data_tx_avg = (data_tx_avg / Math.max(data_tx.length, 1));
+
 						/* remember current timestamp, calculate horizontal scale */
 						data_stamp = data[data.length-1][TIME];
 						data_scale = height / (data_max * 1.1);