Quick Backport of latest OpenWrt changes

[oweals/luci.git] / modules / admin-mini / luasrc / model / cbi / mini / wifi.lua

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index e938826f51bda30ef3e6b9a424ecbde0a958d798..8b623090b781063ab818145db349eefee37935b1 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -89,6 +89,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))
@@ -127,6 +128,7 @@ end
 -- Config Section --
 
 s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
+s.addremove = false
 
 en = s:option(Flag, "disabled", translate("enable"))
 en.enabled = "0"
@@ -140,7 +142,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")
@@ -159,6 +161,7 @@ end
 
 s = m:section(TypedSection, "wifi-iface", translate("m_n_local"))
 s.anonymous = true
+s.addremove = false
 
 s:option(Value, "ssid", translate("a_w_netid"))