From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 9 Dec 2015 15:51:48 +0000 (+0100)
Subject: luci-app-olsr: use public interface of luci.model.network.wifinet (#569)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63155e99325d2f7b57eee99496648e7a3cf6c14b;p=oweals%2Fluci.git

luci-app-olsr: use public interface of luci.model.network.wifinet (#569)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---

diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index cfadd9b7c..9a997bdc1 100644
--- a/applications/luci-app-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua
@@ -171,11 +171,12 @@ function action_neigh(json)
 
 	for _, dev in ipairs(devices) do
 		for _, net in ipairs(dev:get_wifinets()) do
+			local radio = net:get_device()
 			assoclist[#assoclist+1] = {} 
-			assoclist[#assoclist]['ifname'] = net.iwdata.ifname
-			assoclist[#assoclist]['network'] = net.iwdata.network
-			assoclist[#assoclist]['device'] = net.iwdata.device
-			assoclist[#assoclist]['list'] = net.iwinfo.assoclist
+			assoclist[#assoclist]['ifname'] = net:ifname()
+			assoclist[#assoclist]['network'] = net:network()[1]
+			assoclist[#assoclist]['device'] = radio and radio:name() or nil
+			assoclist[#assoclist]['list'] = net:assoclist()
 		end
 	end