Merge pull request #656 from nlhintz/pull-request

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

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 2289ca3..2dff4dd 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -505,6 +505,9 @@ if hwtype == "mac80211" then
        wmm:depends({mode="ap"})
        wmm:depends({mode="ap-wds"})
        wmm.default = wmm.enabled
        wmm:depends({mode="ap"})
        wmm:depends({mode="ap-wds"})
        wmm.default = wmm.enabled

+       
+       ifname = s:taboption("advanced", Value, "ifname", translate("Interface name"), translate("Override default interface name"))
+       ifname.optional = true

 end
 
 
 end
 
 


@@ -994,6 +997,24 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
        identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
        identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
 
        identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
        identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
 

+       anonymous_identity = s:taboption("encryption", Value, "anonymous_identity", translate("Anonymous Identity"))
+       anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa"})
+       anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa"})
+       anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
+       anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
+       anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
+

        password = s:taboption("encryption", Value, "password", translate("Password"))
        password:depends({mode="sta", eap_type="fast", encryption="wpa2"})
        password:depends({mode="sta", eap_type="fast", encryption="wpa"})
        password = s:taboption("encryption", Value, "password", translate("Password"))
        password:depends({mode="sta", eap_type="fast", encryption="wpa2"})
        password:depends({mode="sta", eap_type="fast", encryption="wpa"})