Add GUI for 802.11s

[oweals/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 8ff6b3a13197258c6e4b935f7cc33a6d8f691df0..43f0ab68105ae2c47e18c95fc2bcc1659104c413 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -27,6 +27,7 @@ back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
 en = s:option(Flag, "disabled", translate("enable"))
 en.enabled = "0"
 en.disabled = "1"
+en.rmempty = false
 
 function en.cfgvalue(self, section)
        return Flag.cfgvalue(self, section) or "0"
@@ -52,6 +53,8 @@ ch:value(151, 151 .. " (5 GHz)")
 ch:value(155, 155 .. " (5 GHz)")
 ch:value(167, 167 .. " (5 GHz)")
 
+s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
 ------------------- MAC80211 Device ------------------
 
 if hwtype == "mac80211" then
@@ -62,7 +65,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")
@@ -72,7 +75,7 @@ if hwtype == "atheros" then
        mode:value("11adt", "802.11adt")
        mode:value("fh", translate("wifi_fh"))
 
-       s:option(Flag, "diversity", translate("wifi_diversity"))
+       s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false
 
        if not nsantenna then
                s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
@@ -98,14 +101,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 +164,14 @@ bssid = s:option(Value, "bssid", translate("wifi_bssid"))
 -------------------- MAC80211 Interface ----------------------
 
 if hwtype == "mac80211" then
+       if luci.fs.mtime("/usr/sbin/iw") then
+               mode:value("mesh", "802.11s")
+       end
+
+       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, "frag", translate("wifi_frag")).optional = true
        s:option(Value, "rts", translate("wifi_rts")).optional = true
 end
@@ -189,7 +196,6 @@ 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
        hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
        hidden:depends({mode="ap"})
        hidden:depends({mode="adhoc"})
@@ -233,6 +239,11 @@ if hwtype == "atheros" then
        local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
        nos:depends({mode="sta"})
        nos.optional = true
+
+       local probereq = s:option(Flag, "probereq", translate("wifi_noprobereq"))
+       probereq.optional = true
+       probereq.enabled  = "0"
+       probereq.disabled = "1"
 end
 
 
@@ -254,6 +265,7 @@ if hwtype == "broadcom" then
        isolate.optional = true
 
        bssid:depends({mode="wds"})
+       bssid:depends({mode="adhoc"})
 end
 
 
@@ -267,6 +279,7 @@ encr:depends({mode="sta"})
 encr:depends({mode="adhoc"})
 encr:depends({mode="ahdemo"})
 encr:depends({mode="wds"})
+encr:depends({mode="mesh"})
 
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")