diff options
| author | Georgi Valkov <gvalkov@abv.bg> | 2015-07-18 01:22:47 +0300 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-07-27 11:37:09 +0200 |
| commit | 159b60f449b50d3069478c95203ebbaa90861ff5 (patch) | |
| tree | b37cdf49922b6aca33be480680d8548e8d2ed1a8 /modules/luci-base | |
| parent | 0110494b18cd8234b09c4be1cffa2d81a17d732a (diff) | |
Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio.
Diffstat (limited to 'modules/luci-base')
| -rw-r--r-- | modules/luci-base/luasrc/model/network.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index b6e390e81..20e103276 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) |