Re: [OpenWrt-Devel] [PATCH] Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio

2015-07-27 Thread Jo-Philipp Wich
Applied to master and for-15.05 - thanks!

~ Jow
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] Fix: Status for disabled wireless networks may display the SSID, BSSID and Mode of an active network on the same radio

2015-07-24 Thread George Valkov
 From 8965b583ea76bf851098159675b2901e1920c646 Mon Sep 17 00:00:00 2001  From: 
Georgi ValkovDate: 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 b6e390e..20e1032 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)  --
  1.9.1  
 ___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel