From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 25 Sep 2011 23:08:47 +0000 (+0000)
Subject: modules/admin-full: ... and another issue, also remove wifi up workaround, its done... 
X-Git-Tag: 0.11.0~1697
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=730b2b0d07bfa2c8aeeb8877aaf2444e5ccbc7a4

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

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index d151a9a59..d76f83ffb 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 5b298ea12..4b2b88b14 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