Allow the use of psk+psk2 (ap mode only). Thanks ragorn

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7682 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 6a38d0383a95aa2c308f844486c41749ab3c96b5..a7ffabcef7c166d53a5cfc1d2cf87efa7764205b 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -152,7 +152,8 @@ enable_broadcom() {
                                wsec_r=1
                                config_get key "$vif" key
                                case "$enc" in
-                                       wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
+                                       wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
+                                       wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
                                        *) auth=4; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""
@@ -165,6 +166,7 @@ enable_broadcom() {
                                config_get server "$vif" server
                                config_get port "$vif" port
                                case "$enc" in
+                                       wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;;
                                        wpa2*|WPA2*) auth=64; wsec=4;;
                                        *) auth=2; wsec=2;;
                                esac