diff options
| -rw-r--r-- | libs/uvl/root/lib/uci/schema/default/wireless | 14 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libs/uvl/root/lib/uci/schema/default/wireless b/libs/uvl/root/lib/uci/schema/default/wireless index d148b9b33..3b4fb6fe8 100644 --- a/libs/uvl/root/lib/uci/schema/default/wireless +++ b/libs/uvl/root/lib/uci/schema/default/wireless @@ -104,19 +104,19 @@ config variable list depends type=broadcom config variable - option name 'macpolicy' + option name 'macfilter' option section 'wireless.wifi-device' option title 'MAC-Address Filter (broadcom)' option type enum list depends type=broadcom config enum - option variable 'wireless.wifi-device.macpolicy' + option variable 'wireless.wifi-device.macfilter' option value 'deny' option title 'Allow listed only' config enum - option variable 'wireless.wifi-device.macpolicy' + option variable 'wireless.wifi-device.macfilter' option value 'allow' option title 'Allow all except listed' @@ -124,9 +124,9 @@ config variable option name 'maclist' option section 'wireless.wifi-device' option title 'MAC-List (broadcom)' - list depends 'type=broadcom, macpolicy=allow' - list depends 'type=broadcom, macpolicy=deny' - option multival true + list depends 'type=broadcom, macfilter=allow' + list depends 'type=broadcom, macfilter=deny' + option type lazylist option datatype macaddr config variable @@ -308,6 +308,8 @@ config variable option title 'MAC-List (atheros)' list depends 'macpolicy=allow' list depends 'macpolicy=deny' + option type lazylist + option datatype macaddr config variable option name 'rate' 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 cbc30d5c3..b687133ce 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -79,14 +79,14 @@ end ------------------- Broadcom Device ------------------ if hwtype == "broadcom" then - mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy")) + 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")) - ml = s:option(Value, "maclist", translate("wifi_maclist")) - ml:depends({macpolicy="allow"}) - ml:depends({macpolicy="deny"}) + 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 @@ -190,7 +190,7 @@ if hwtype == "atheros" then mp:value("") mp:value("deny", translate("wifi_whitelist")) mp:value("allow", translate("wifi_blacklist")) - ml = s:option(Value, "maclist", translate("wifi_maclist")) + ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) ml:depends({macpolicy="allow"}) ml:depends({macpolicy="deny"}) |