From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 14 Nov 2011 21:37:53 +0000 (+0000)
Subject: [package] broadcom-wl: align RADIUS options with r26482, patch by Etienne Champetier... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e5353818435fbe5c3a679f58f563d4ad89196d43;p=openwrt%2Fsvn-archive%2Farchive.git

[package] broadcom-wl: align RADIUS options with r26482, patch by Etienne Champetier <etienne.champetier@free.fr>


SVN-Revision: 29136
---

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 950033151b..0439f1f72f 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=5.10.56.27.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 8fe801d59b..0f639e1bc1 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -245,9 +245,12 @@ enable_broadcom() {
 			*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
@@ -266,8 +269,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"