From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 22 May 2009 10:31:22 +0000 (+0000)
Subject: merge r15893 to 8.09
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=fe18dc1bf37ad3936a6167acf9cfcac9a780c7c2;p=openwrt%2Fsvn-archive%2Farchive.git

merge r15893 to 8.09

SVN-Revision: 15984
---

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index cc0af0f69e..d33524f2c9 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=4.150.10.5.3
-PKG_RELEASE:=3.1
+PKG_RELEASE:=3.2
 WLC_VERSION:=0.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 998a2f58ff..9ce49ab6fb 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -199,6 +199,7 @@ enable_broadcom() {
 				case "$enc" in
 					wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
 					wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
+					*aes|*AES) auth=4; wsec=4;;
 					*) auth=4; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""