From: Georgi Valkov <gvalkov@abv.bg>
Date: Fri, 17 Jul 2015 22:22:47 +0000 (+0300)
Subject: Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=91faca4009b32a33731f498427eda3a52beb964a;p=project%2Fluci.git

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

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)