Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: merge r7870

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-11-02 19:00:46 +00:00
parent 6285f95975
commit 1f96239c94
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/admin-full/luasrc/controller/admin/network.lua
View file

@ -227,8 +227,7 @@ function iface_status()
local net = netm:get_network(iface) local net = netm:get_network(iface)
local device = net and net:get_interface() local device = net and net:get_interface()
if device then if device then
local device = net:get_interface() local data = {
local data = {
id = iface, id = iface,
proto = net:proto(), proto = net:proto(),
uptime = net:uptime(), uptime = net:uptime(),
@ -374,11 +373,13 @@ function wifi_reconnect()
local net = netmd:get_wifinet(wnet) local net = netmd:get_wifinet(wnet)
local dev = net:get_device() local dev = net:get_device()
if dev and net then if dev and net then
luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
dev:set("disabled", nil) dev:set("disabled", nil)
net:set("disabled", (mode == "wireless_shutdown") and 1 or nil) net:set("disabled", (mode == "wireless_shutdown") and 1 or nil)
netmd:commit("wireless") 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") luci.http.status(200, (mode == "wireless_shutdown") and "Shutdown" or "Reconnected")
return return