From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 20 Jun 2007 20:00:47 +0000 (+0000)
Subject: Allow the use of psk+psk2 (ap mode only). Thanks ragorn
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=7f44b2ab9edfa8916054321d8432c367c3ce727b;hp=8fc781e83edccbd68b801d872092fdab3ff335d0

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 6a38d0383..a7ffabcef 100644
--- 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