* modules/admin-full: adept wifi model to cover new broadcom options

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua

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 fa3ad753b31ee4149b373079801d73599cfd2cee..043c3284e298c2d4250d3bb3b42b1bddf16ed62b 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -104,8 +104,9 @@ if hwtype == "broadcom" then
        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(Value, "txpower", translate("a_w_txpwr"), "dBm").optional = true
 
        s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true
 
@@ -164,7 +165,7 @@ if hwtype == "mac80211" then
        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"})
@@ -225,6 +226,14 @@ if hwtype == "atheros" then
        s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
        s:option(Flag, "xr", translate("wifi_xr")).optional = true
        s:option(Flag, "ar", translate("wifi_ar")).optional = true
+
+       local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon"))
+       swm:depends({mode="adhoc"})
+       swm.optional = true
+
+       local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
+       nos:depends({mode="sta"})
+       nos.optional = true
 end