Changeset 7565

Timestamp:

09/26/11 00:08:47 (20 months ago)

Author:

jow

Message:

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

Location:

luci/trunk/modules/admin-full/luasrc

Files:

• controller/admin/network.lua (modified) (1 diff)
• model/cbi/admin_network/ifaces.lua (modified) (1 diff)

luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua

@@ -283 +283 @@
     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")

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua

@@ -158 +158 @@
         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