modules/admin-full: fix wifi join when "wwan" (or other iface) already exists but...

[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 51b84df..f5d6cf4 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -25,6 +25,7 @@ m = Map("wireless", "",
                "like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
 
 m:chain("network")
+m:chain("firewall")
 
 local ifsection
 
@@ -170,6 +171,9 @@ if hwtype == "mac80211" then
 
        s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
                translate("Distance to farthest network member in meters."))
+
+       s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+       s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
 end
 
 
@@ -354,10 +358,9 @@ if hwtype == "mac80211" then
        mode:value("monitor", translate("Monitor"))
        bssid:depends({mode="adhoc"})
 
-       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:depends({mode="ap"})
+       mp:depends({mode="ap-wds"})
        mp:value("", translate("disable"))
        mp:value("allow", translate("Allow listed only"))
        mp:value("deny", translate("Allow all except listed"))