luci-0.8: merge r4711

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 9227fd2bde37f614a50ee9c35f31b388989871bb..482341c70cebe6e521b47ce6ce01fd539547d65f 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -58,7 +58,7 @@ end
 if hwtype == "atheros" then
        s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 
-       mode = s:option(ListValue, "mode", translate("mode"))
+       mode = s:option(ListValue, "hwmode", translate("mode"))
        mode:value("", translate("wifi_auto"))
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 22fd03fea9b079c20f0f9a96379eafa8f7981628..e49fb609b28d2e02cbcadd5d4542206262de0d8f 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -150,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")