[backfire] broadcom-wl: backport r29136

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29138 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 6b68b84c2e6a9741fca9ae2f720f167fcd2c8beb..ff29cd6e368ee6249ea67d2bd714e0020305e56a 100644 (file)
--- 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:=8
+PKG_RELEASE:=9
 WLC_VERSION:=0.2
 
 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 569e4e07feb46709dd54071c6ce226b738101c6a..e2e2e02387df704455682cae290221a19a78190d 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -238,9 +238,14 @@ enable_broadcom() {
                        *wpa*|*WPA*)
                                wsec_r=1
                                eap_r=1
-                               config_get key "$vif" key
-                               config_get server "$vif" server
-                               config_get port "$vif" port
+                               config_get auth_server "$vif" auth_server
+                               [ -z "$auth_server" ] && config_get auth_server "$vif" server
+                               config_get auth_port "$vif" auth_port
+                               [ -z "$auth_port" ] && config_get auth_port "$vif" port
+                               config_get auth_secret "$vif" auth_secret
+                               [ -z "$auth_secret" ] && config_get auth_secret "$vif" key
+
+                               # wpa version + default cipher
                                case "$enc" in
                                        wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;;
                                        wpa2*|WPA2*) auth=64; wsec=4;;
@@ -249,8 +254,8 @@ enable_broadcom() {
                                # group rekey interval
                                config_get rekey "$vif" wpa_group_rekey
 
-                               eval "${vif}_key=\"\$key\""
-                               nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}${rekey:+ -g $rekey}"
+                               eval "${vif}_key=\"\$auth_secret\""
+                               nasopts="-r \"\$${vif}_key\" -h $auth_server -p ${auth_port:-1812}${rekey:+ -g $rekey}"
                        ;;
                esac
                append vif_do_up "wsec $wsec" "$N"