From: Jo-Philipp Wich Date: Thu, 11 Apr 2013 13:36:22 +0000 (+0000) Subject: modules/admin-full: attempt to determine switch cpu port from /proc/switch/eth0/cpupo... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c5557fc90b082c88cb2322fffc6c672330a21494;p=project%2Fluci.git modules/admin-full: attempt to determine switch cpu port from /proc/switch/eth0/cpuport in order to properly support newer broadcom models --- diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua index 0fa2696e8a..8fcf9af982 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua @@ -14,6 +14,7 @@ You may obtain a copy of the License at m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several VLANs in which computers can communicate directly with each other. VLANs are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.")) +local fs = require "nixio.fs" local switches = { } m.uci:foreach("network", "switch", @@ -28,7 +29,7 @@ m.uci:foreach("network", "switch", local max_vid = 16 local num_vlans = 16 local num_ports = 6 - local cpu_port = 5 + local cpu_port = tonumber(fs.readfile("/proc/switch/eth0/cpuport") or 5) local switch_title local enable_vlan4k = false