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

Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio.

Browse source
This commit is contained in:
Georgi Valkov 2015-07-18 01:22:47 +03:00 committed by Jo-Philipp Wich
parent 5d71ab50fb
commit 91faca4009
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/luci-base/luasrc/model/network.lua
View file

@ -1421,7 +1421,7 @@ function wifinet.is_up(self)
end end
function wifinet.active_mode(self) 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" if m == "ap" then m = "Master"
elseif m == "sta" then m = "Client" elseif m == "sta" then m = "Client"
@ -1438,11 +1438,11 @@ function wifinet.active_mode_i18n(self)
end end
function wifinet.active_ssid(self) function wifinet.active_ssid(self)
return _stror(self.iwinfo.ssid, self.iwdata.ssid) return _stror(self.iwdata.ssid, self.iwinfo.ssid)
end end
function wifinet.active_bssid(self) 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 end
function wifinet.active_encryption(self) function wifinet.active_encryption(self)