modules/admin-full: ... and another issue, also remove wifi up workaround, its done...

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index d151a9a599e2a101cfe116890ac0ee83d952ee96..d76f83ffb66493cfa2668607bbcece63e34b9b72 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -282,23 +282,6 @@ function iface_reconnect()
 
        local net = netmd:get_network(iface)
        if net then
-               local ifn
-               for _, ifn in ipairs(net:get_interfaces()) do
-                       local wnet = ifn:get_wifinet()
-                       if wnet then
-                               local wdev = wnet:get_device()
-                               if wdev then
-                                       luci.sys.call(
-                                               "env -i /sbin/wifi up %q >/dev/null 2>/dev/null"
-                                                       % wdev:name()
-                                       )
-
-                                       luci.http.status(200, "Reconnected")
-                                       return
-                               end
-                       end
-               end
-
                luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
                luci.http.status(200, "Reconnected")
                return

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 5b298ea12de706792e77748a666dc7cacdf91e6a..4b2b88b14761dc1919a39a5f25b1ec49fe8f28bc 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -157,7 +157,7 @@ function ifname_single.write(self, s, val)
                local new_ifs = { }
                local old_ifs = { }
 
-               for _, i in ipairs(n:get_interfaces()) do
+               for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
                        old_ifs[#old_ifs+1] = i:name()
                end