diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-04 22:43:45 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-04 22:43:45 +0000 |
| commit | 0feb0a4607bfe4472c60941b59f2fd7e1c4f4947 (patch) | |
| tree | 9a2d7b7cd1d770ca1cd9357f734eec2ff9937cd3 /modules/admin-full | |
| parent | f1b667fc6fd9e9d8eab8a90f5f8f2f4346364597 (diff) | |
modules/admin-{mini,full}: implement wpa-wpa2 mixed mode
modules/admin-core: extend uci schema to cover mixed mode and mesh mode (802.11s)
Diffstat (limited to 'modules/admin-full')
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 4 |
1 files changed, 4 insertions, 0 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 43f0ab681..7d1812177 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -291,17 +291,20 @@ if hwtype == "atheros" or hwtype == "mac80211" then if hostapd and supplicant then encr:value("psk", "WPA-PSK") encr:value("psk2", "WPA2-PSK") + encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode") encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}) encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"}) elseif hostapd and not supplicant then encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"}) encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"}) + encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"}) encr:value("wpa", "WPA-EAP", {mode="ap"}) encr:value("wpa2i", "WPA2-EAP", {mode="ap"}) encr.description = translate("wifi_wpareq") elseif not hostapd and supplicant then encr:value("psk", "WPA-PSK", {mode="sta"}) encr:value("psk2", "WPA2-PSK", {mode="sta"}) + encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}) encr:value("wpa", "WPA-EAP", {mode="sta"}) encr:value("wpa2i", "WPA2-EAP", {mode="sta"}) encr.description = translate("wifi_wpareq") @@ -311,6 +314,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then elseif hwtype == "broadcom" then encr:value("psk", "WPA-PSK") encr:value("psk2", "WPA2-PSK") + encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode") end encr:depends("mode", "ap") |