From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 8 Aug 2012 20:07:39 +0000 (+0000)
Subject: modules/freifunk: use getiwinfo() instead of getiwconfig()
X-Git-Tag: 0.11.0~412
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a521cddcf89bb47c1dd20581c428bc4566d478e4

modules/freifunk: use getiwinfo() instead of getiwconfig()
---

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 1b5513125..666f0864b 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -219,7 +219,6 @@ function jsonstatus()
 	root.network = {}
 	root.wireless = {devices = {}, interfaces = {}, status = {}}
 	local wifs = root.wireless.interfaces
-	local wifidata = luci.sys.wifi.getiwconfig() or {}
 	local netdata = luci.sys.net.deviceinfo() or {}
 
 	for _, vif in ipairs(ffwifs) do
@@ -229,7 +228,18 @@ function jsonstatus()
 			if s.device == vif and s.network == vif then
 				wifs[#wifs+1] = s
 				if s.ifname then
-					root.wireless.status[s.ifname] = wifidata[s.ifname]
+					local iwinfo = luci.sys.wifi.getiwinfo(s.ifname)
+					if iwinfo then
+						root.wireless.status[s.ifname] = { }
+
+						local _, f
+						for _, f in ipairs({
+							"channel", "txpower", "bitrate", "signal", "noise",
+							"quality", "quality_max", "mode", "ssid", "bssid", "encryption", "ifname"
+						}) do
+							root.wireless.status[s.ifname][f] = iwinfo[f]
+						end
+					end
 				end
 			end
 		end)