From 901b122d8353321cf8d1ee851aafc796df19568c Mon Sep 17 00:00:00 2001
From: Julian Labus <julian@labus-online.de>
Date: Sun, 9 Apr 2017 20:36:04 +0200
Subject: [PATCH] gluon-web-wifi-config: use find_phy from gluon.util
---
.../lib/gluon/web/model/admin/wifi-config.lua | 23 ++-----------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/package/gluon-web-wifi-config/luasrc/lib/gluon/web/model/admin/wifi-config.lua b/package/gluon-web-wifi-config/luasrc/lib/gluon/web/model/admin/wifi-config.lua
index 7df669b00..e9a271a77 100644
--- a/package/gluon-web-wifi-config/luasrc/lib/gluon/web/model/admin/wifi-config.lua
+++ b/package/gluon-web-wifi-config/luasrc/lib/gluon/web/model/admin/wifi-config.lua
@@ -4,21 +4,6 @@ local uci = require("simple-uci").cursor()
local util = require 'gluon.util'
-local function find_phy_by_path(path)
- for phy in fs.glob("/sys/devices/" .. path .. "/ieee80211/phy*") do
- return phy:match("([^/]+)$")
- end
-end
-
-local function find_phy_by_macaddr(macaddr)
- local addr = macaddr:lower()
- for file in fs.glob("/sys/class/ieee80211/*/macaddress") do
- if util.trim(fs.readfile(file)) == addr then
- return file:match("([^/]+)/macaddress$")
- end
- end
-end
-
local function txpower_list(phy)
local list = iwinfo.nl80211.txpwrlist(phy) or { }
local off = tonumber(iwinfo.nl80211.txpower_offset(phy)) or 0
@@ -84,12 +69,8 @@ uci:foreach('wireless', 'wifi-device', function(config)
vif_option('mesh', translate("Enable mesh network (802.11s)"))
vif_option('ibss', translate("Enable mesh network (IBSS)"))
- local phy
- if config.path then
- phy = find_phy_by_path(config.path)
- elseif config.macaddr then
- phy = find_phy_by_macaddr(config.macaddr)
- else
+ local phy = util.find_phy(config)
+ if not phy then
return
end
--
GitLab