From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 28 Oct 2011 22:36:15 +0000 (+0000)
Subject: libs/core: fix status reporting of standalone wifi iface in network model
X-Git-Tag: 0.11.0~1424
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=84cbbf39682ebfc5f662d820294c76988110d55c;ds=inline

libs/core: fix status reporting of standalone wifi iface in network model
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index dd2bdfb90..eff84f810 100644
--- 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
-						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]