aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-06-20 20:00:47 +0000
committerMike Baker <mbm@openwrt.org>2007-06-20 20:00:47 +0000
commit4fdfc0f79b451d9ce4cfb455712c653dc21b84a9 (patch)
treec096ec5ee433813cb69e1c3ff5571985eaedc8f7
parent04284de5ef9f4a2ecbc10f89b0bdbeb9fcf72aa4 (diff)
downloadupstream-4fdfc0f79b451d9ce4cfb455712c653dc21b84a9.tar.gz
upstream-4fdfc0f79b451d9ce4cfb455712c653dc21b84a9.tar.bz2
upstream-4fdfc0f79b451d9ce4cfb455712c653dc21b84a9.zip
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
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 6a38d0383a..a7ffabcef7 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