diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-25 23:08:47 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-25 23:08:47 +0000 |
| commit | 730b2b0d07bfa2c8aeeb8877aaf2444e5ccbc7a4 (patch) | |
| tree | 6b3b81bbbc950c05a39e14caa790c3b5db9b1dde | |
| parent | 8eb93354138685a83a3ae9994be770ceb63bf9fe (diff) | |
modules/admin-full: ... and another issue, also remove wifi up workaround, its done by "ifup" now
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/network.lua | 17 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index d151a9a599..d76f83ffb6 100644 --- 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 5b298ea12d..4b2b88b147 100644 --- 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 |