From da527d2c4403ec414c871938e5470f23fc489e88 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 26 Oct 2011 22:52:18 +0000 Subject: [PATCH] modules/admin-full: remove associated network for the wifi-iface as well if it would be empty afterwards --- modules/admin-full/luasrc/controller/admin/network.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index 87cc040ea..40856af2c 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -198,14 +198,18 @@ end function wifi_delete(network) local ntm = require "luci.model.network".init() - local net = ntm:get_wifinet(network) - - if net then - local dev = net:get_device() + local wnet = ntm:get_wifinet(network) + if wnet then + local dev = wnet:get_device() + local net = wnet:get_network() if dev then luci.sys.call("env -i /sbin/wifi down %q" % dev:name()) ntm:del_wifinet(network) ntm:commit("wireless") + if net:is_empty() then + ntm:del_network(net:name()) + ntm:commit("network") + end luci.sys.call("env -i /sbin/wifi up %q" % dev:name()) end end -- 2.11.0