X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=b64190bc0a64a8182c9d53b6740bb3a7295aa423;hb=a3d603df27571ae4fa67cbc11b0ed04f1de0723e;hp=8ff6b3a13197258c6e4b935f7cc33a6d8f691df0;hpb=5ae95430e173381c4f2bab38c5059deedc27dcc4;p=project%2Fluci.git

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 8ff6b3a13..b64190bc0 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -62,7 +62,7 @@ end
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then
-	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")
@@ -98,14 +98,14 @@ if hwtype == "broadcom" then
 	mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy"))
 	mp.optional = true
 	mp:value("")
-	mp:value("deny", translate("wifi_whitelist"))
-	mp:value("allow", translate("wifi_blacklist"))
+	mp:value("allow", translate("wifi_whitelist"))
+	mp:value("deny", translate("wifi_blacklist"))
 	ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
 	ml:depends({macfilter="allow"})
 	ml:depends({macfilter="deny"})
 
-	s:option(Value, "txant", translate("wifi_txantenna")).optional = true
-	s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true
+	s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
+	s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
 
 	s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true
 
@@ -161,10 +161,11 @@ bssid = s:option(Value, "bssid", translate("wifi_bssid"))
 -------------------- MAC80211 Interface ----------------------
 
 if hwtype == "mac80211" then
+	mode:value("ahdemo", translate("a_w_ahdemo"))
 	mode:value("monitor", translate("a_w_monitor"))
 	bssid:depends({mode="adhoc"})
 
-	s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 	s:option(Value, "frag", translate("wifi_frag")).optional = true
 	s:option(Value, "rts", translate("wifi_rts")).optional = true
 end
@@ -189,7 +190,7 @@ if hwtype == "atheros" then
 	wdssep.optional = true
 
 	s:option(Flag, "doth", "802.11h").optional = true
-	s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 	hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
 	hidden:depends({mode="ap"})
 	hidden:depends({mode="adhoc"})
@@ -242,6 +243,8 @@ if hwtype == "broadcom" then
 	mode:value("wds", translate("a_w_wds"))
 	mode:value("monitor", translate("a_w_monitor"))
 
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
 	hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
 	hidden:depends({mode="ap"})
 	hidden:depends({mode="adhoc"})