From 2d28a55a53b7764711d401d7d040cfd71caebe77 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 25 Jun 2011 22:14:00 +0000 Subject: [PATCH] modules/admin-full: relocate mac80211 mac filter settings to wifi-iface (#247) --- .../luasrc/model/cbi/admin_network/wifi.lua | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) 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 a6be2fabd..002041911 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -135,16 +135,6 @@ if hwtype == "mac80211" then --htcapab:depends("hwmode", "11ng") end - mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter")) - mp:value("", translate("disable")) - mp:value("allow", translate("Allow listed only")) - mp:value("deny", translate("Allow all except listed")) - - ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) - ml.datatype = "macaddr" - ml:depends({macfilter="allow"}) - ml:depends({macfilter="deny"}) - local cl = iw and iw.countrylist if cl and #cl > 0 then cc = s:taboption("advanced", ListValue, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes.")) @@ -241,16 +231,6 @@ if hwtype == "broadcom" then mode:value("11g", "802.11g") mode:value("11gst", "802.11g + Turbo") - mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter")) - mp:value("", translate("disable")) - mp:value("allow", translate("Allow listed only")) - mp:value("deny", translate("Allow all except listed")) - - ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) - ml.datatype = "macaddr" - ml:depends({macfilter="allow"}) - ml:depends({macfilter="deny"}) - ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna")) ant1.widget = "radio" ant1:depends("diversity", "") @@ -354,6 +334,16 @@ if hwtype == "mac80211" then s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold")) s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold")) + + mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter")) + mp:value("", translate("disable")) + mp:value("allow", translate("Allow listed only")) + mp:value("deny", translate("Allow all except listed")) + + ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) + ml.datatype = "macaddr" + ml:depends({macfilter="allow"}) + ml:depends({macfilter="deny"}) mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")}) mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")}) -- 2.25.1