From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 29 May 2009 20:19:42 +0000 (+0000)
Subject: luci-0.8: merge r4711
X-Git-Tag: 0.8.7~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5afd00ec90464fa3a12f770ef335697efacdc15e;p=oweals%2Fluci.git

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 9227fd2bd..482341c70 100644
--- 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 22fd03fea..e49fb609b 100644
--- 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")