projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c68b74
)
libs/core: fix status reporting of standalone wifi iface in network model
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 28 Oct 2011 22:36:15 +0000
(22:36 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 28 Oct 2011 22:36:15 +0000
(22:36 +0000)
libs/core/luasrc/model/network.lua
patch
|
blob
|
history
diff --git
a/libs/core/luasrc/model/network.lua
b/libs/core/luasrc/model/network.lua
index
dd2bdfb
..
eff84f8
100644
(file)
--- a/
libs/core/luasrc/model/network.lua
+++ b/
libs/core/luasrc/model/network.lua
@@
-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
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
return false
end
end
@@
-927,7
+927,10
@@
interface = utl.class()
function interface.__init__(self, ifname, network)
local wif = _wifi_lookup(ifname)
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]
self.ifname = self.ifname or ifname
self.dev = _interfaces[self.ifname]