From 159b60f449b50d3069478c95203ebbaa90861ff5 Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Sat, 18 Jul 2015 01:22:47 +0300 Subject: [PATCH] Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio. --- modules/luci-base/luasrc/model/network.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index b6e390e818..20e1032760 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -1421,7 +1421,7 @@ function wifinet.is_up(self) end function wifinet.active_mode(self) - local m = _stror(self.iwinfo.mode, self.iwdata.mode) or "ap" + local m = _stror(self.iwdata.mode, self.iwinfo.mode) or "ap" if m == "ap" then m = "Master" elseif m == "sta" then m = "Client" @@ -1438,11 +1438,11 @@ function wifinet.active_mode_i18n(self) end function wifinet.active_ssid(self) - return _stror(self.iwinfo.ssid, self.iwdata.ssid) + return _stror(self.iwdata.ssid, self.iwinfo.ssid) end function wifinet.active_bssid(self) - return _stror(self.iwinfo.bssid, self.iwdata.bssid) or "00:00:00:00:00:00" + return _stror(self.iwdata.bssid, self.iwinfo.bssid) or "00:00:00:00:00:00" end function wifinet.active_encryption(self) -- 2.30.2