From 279a4091989607961f32154ecbc9d2e29dda65c4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 27 Jul 2016 03:28:36 +0200 Subject: [PATCH] gluon-core: split get_wlan_mac_from_driver() out of get_wlan_mac() --- package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua index b9e81b1f..677cfc52 100644 --- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua +++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua @@ -151,7 +151,7 @@ function get_mac(index) return generate_mac(3*(index-1)) end -function get_wlan_mac(radio, index, vif) +function get_wlan_mac_from_driver(radio, vif) local primary = sysconfig.primary_mac:lower() local i = 1 @@ -164,6 +164,13 @@ function get_wlan_mac(radio, index, vif) i = i + 1 end end +end + +function get_wlan_mac(radio, index, vif) + local addr = get_wlan_mac_from_driver(radio, vif) + if addr then + return addr + end return generate_mac(3*(index-1) + (vif-1)) end