luci-0.10: merge r7328

diff --git a/applications/luci-wol/luasrc/model/cbi/wol.lua b/applications/luci-wol/luasrc/model/cbi/wol.lua
index 30467f43090273e60bc389d7fe849b288c7afdb9..ad3479bca2381f75880aa73c37d6ec846ccb0040 100644 (file)
--- a/applications/luci-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-wol/luasrc/model/cbi/wol.lua
@@ -72,7 +72,14 @@ end
 uci:foreach("dhcp", "host",
        function(s)
                if s.mac and s.ip then
-                       arp[s.mac:upper()] = { s.ip, s.name }
+                       if type(s.mac) == "table" then
+                               local m
+                               for _, m in ipairs(s.mac) do
+                                       arp[m:upper()] = { s.ip, s.name }
+                               end
+                       else
+                               arp[s.mac:upper()] = { s.ip, s.name }
+                       end
                end
        end)