From 47f011b947f3416c64f2352ca988de6004f49e5f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 24 Sep 2011 03:31:00 +0000 Subject: [PATCH] libs/core: non-bridge handling fix in network model --- libs/core/luasrc/model/network.lua | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua index 26344c2cc..983483d82 100644 --- a/libs/core/luasrc/model/network.lua +++ b/libs/core/luasrc/model/network.lua @@ -791,26 +791,23 @@ function network.get_interfaces(self) ifaces[#ifaces+1] = nfs[ifn] end - local num = { } - local wfs = { } - uci_r:foreach("wireless", "wifi-iface", - function(s) - if s.device then - num[s.device] = num[s.device] and num[s.device] + 1 or 1 - if s.network == self.sid then - ifn = "%s.network%d" %{ s.device, num[s.device] } - wfs[ifn] = interface(ifn, self) + if self:is_bridge() then + local num = { } + local wfs = { } + uci_r:foreach("wireless", "wifi-iface", + function(s) + if s.device then + num[s.device] = num[s.device] and num[s.device] + 1 or 1 + if s.network == self.sid then + ifn = "%s.network%d" %{ s.device, num[s.device] } + wfs[ifn] = interface(ifn, self) + end end - end - end) - - for ifn in utl.kspairs(wfs) do - ifaces[#ifaces+1] = wfs[ifn] + end) - -- only bridges may cover more than one interface - --if not self:is_bridge() then - -- break - --end + for ifn in utl.kspairs(wfs) do + ifaces[#ifaces+1] = wfs[ifn] + end end return ifaces -- 2.11.0