luci-0.10: merge r7341

diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index 16cd32a2c11795598d16fcc53fef87b5ac316c85..aab8ead99c0d5a87d799ba1261cac63d050a9752 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -140,7 +140,7 @@ $Id$
                                                '<strong><%:Gateway%>: </strong>%s<br />',
                                                        ifc.proto,
                                                        (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
-                                                       (ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
+                                                       (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
                                                        (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0'
                                        );