From d2367c34054f7eff8e894e0b63dce71f53eac56a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 28 Oct 2011 22:36:47 +0000 Subject: [PATCH 1/1] luci-0.10: merge r7844 --- libs/core/luasrc/model/network.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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] -- 2.11.0