Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: merge r7844

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-10-28 22:36:47 +00:00
parent 2dc3077c5e
commit d2367c3405
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/core/luasrc/model/network.lua
View file

@ -847,7 +847,7 @@ function protocol.get_interface(self)
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.ifname or "%s.network%d" %{ s.device, num[s.device] }
ifn = "%s.network%d" %{ s.device, num[s.device] }
return false
end
end
@ -927,7 +927,10 @@ interface = utl.class()
function interface.__init__(self, ifname, network)
local wif = _wifi_lookup(ifname)
if wif then self.wif = wifinet(wif) end
if wif then
self.wif = wifinet(wif)
self.ifname = _uci_state:get("wireless", wif, "ifname")
end
self.ifname = self.ifname or ifname
self.dev = _interfaces[self.ifname]