luci-0.8: Merge r4441

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 0886144..e9261a3 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -66,7 +66,7 @@ end
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then
-       mode = s:option(ListValue, "hwmode", translate("mode"))
+       mode = s:option(ListValue, "mode", 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 e87e7ed..6cf0874 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, "hwmode", translate("mode"))
+       mode = s:option(ListValue, "mode", translate("mode"))
        mode.override_values = true
        mode:value("", "auto")
        mode:value("11b", "802.11b")