From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Nov 2011 19:00:46 +0000 (+0000)
Subject: luci-0.10: merge r7870
X-Git-Tag: 0.10.0~52
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=1f96239c94e6bdbd8946fb7d65b269e9da14fc5d;p=project%2Fluci.git

luci-0.10: merge r7870
---

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 40856af2c2..a79d080a7c 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -227,8 +227,7 @@ function iface_status()
 		local net = netm:get_network(iface)
 		local device = net and net:get_interface()
 		if device then
-			local device = net:get_interface()
-			local data   = {
+			local data = {
 				id         = iface,
 				proto      = net:proto(),
 				uptime     = net:uptime(),
@@ -374,11 +373,13 @@ function wifi_reconnect()
 	local net = netmd:get_wifinet(wnet)
 	local dev = net:get_device()
 	if dev and net then
+		luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
+
 		dev:set("disabled", nil)
 		net:set("disabled", (mode == "wireless_shutdown") and 1 or nil)
 		netmd:commit("wireless")
 
-		luci.sys.call("(env -i /sbin/wifi down; env -i /sbin/wifi up) >/dev/null 2>/dev/null")
+		luci.sys.call("env -i /sbin/wifi up >/dev/null 2>/dev/null")
 		luci.http.status(200, (mode == "wireless_shutdown") and "Shutdown" or "Reconnected")
 
 		return