X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fmodel%2Fcbi%2Fmini%2Fwifi.lua;h=e1d5b396bfd2813297c362726d8ebec63a2046a0;hb=15029e4279f40b6444e203074bee3611638f7894;hp=7327b9e1db6378e175eb418084a720ee6d793d2d;hpb=7b99529d954a19f2b5003d2c14ae2e7a6a30d5cf;p=project%2Fluci.git

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 7327b9e1d..e1d5b396b 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -15,6 +15,13 @@ $Id$
 
 -- Data init --
 
+local uci = luci.model.uci.cursor()
+if not uci:get("network", "wan") then
+	uci:section("network", "interface", "wan", {proto="none", ifname=" "})
+	uci:save("network")
+	uci:commit("network")
+end
+
 local wlcursor = luci.model.uci.cursor_state()
 local wireless = wlcursor:get_all("wireless")
 local wifidata = luci.sys.wifi.getiwconfig()
@@ -89,6 +96,7 @@ end
 t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1"))
 
 function scan.write(self, section)
+	m.autoapply = false
 	t2.render = t2._render
 	local ifname = self.map:get(section, "ifname")
 	luci.util.update(t2.data, luci.sys.wifi.iwscan(ifname))
@@ -130,6 +138,7 @@ s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
 s.addremove = false
 
 en = s:option(Flag, "disabled", translate("enable"))
+en.rmempty = false
 en.enabled = "0"
 en.disabled = "1"
 
@@ -141,7 +150,7 @@ end
 local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
-	mode = s:option(ListValue, "mode", translate("mode"))
+	mode = s:option(ListValue, "hwmode", translate("mode"))
 	mode.override_values = true
 	mode:value("", "auto")
 	mode:value("11b", "802.11b")
@@ -186,12 +195,6 @@ mode:value("sta", translate("m_w_client"))
 
 function mode.write(self, section, value)
 	if value == "sta" then
-		-- ToDo: Move this away
-		if not m.uci:get("network", "wan") then
-			m.uci:set("network", "wan", "proto", "none")
-			m.uci:set("network", "wan", "ifname", " ")
-		end
-
 		local oldif = m.uci:get("network", "wan", "ifname")
 		if oldif and oldif ~= " " then
 			m.uci:set("network", "wan", "_ifname", oldif)