From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 28 Jan 2020 09:08:40 +0000 (+0100)
Subject: luci-mod-network: handle missing switch port state information
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84e23d96b47948e24ce17b79ab46a77cdedf9c2e;p=oweals%2Fluci.git

luci-mod-network: handle missing switch port state information

Ref: https://github.com/openwrt/luci/issues/3565
Ref: https://forum.openwrt.org/t/cannot-read-property-link/50766
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 616d44c155ae2b4f19e8b2645744a107e38a56c7)
---

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js
index 80c8437fc..47a67d5f5 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js
@@ -66,7 +66,7 @@ function render_port_status(node, portstate) {
 	if (!node)
 		return null;
 
-	if (!portstate.link)
+	if (!portstate || !portstate.link)
 		L.dom.content(node, [
 			E('img', { src: L.resource('icons/port_down.png') }),
 			E('br'),
@@ -146,7 +146,7 @@ return L.view.extend({
 			if (!topology) {
 				ui.addNotification(null, _('Switch %q has an unknown topology - the VLAN settings might not be accurate.').replace(/%q/, switch_name));
 
-				topology = {
+				topologies[switch_name] = topology = {
 					features: {},
 					netdevs: {
 						5: 'eth0'