summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-14 21:37:53 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-14 21:37:53 +0000
commit5137298f22db0845ad0a520553553462e58fa8bb (patch)
treef3532fd7ca3ba9fa4c83c16970f5c8a70adba7da
parent6c9b7927d4599d8c37e89888a9388f12c459d04a (diff)
[package] broadcom-wl: align RADIUS options with r26482, patch by Etienne Champetier <etienne.champetier@free.fr>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29136 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/broadcom-wl/Makefile4
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh13
2 files changed, 10 insertions, 7 deletions
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 950033151..0439f1f72 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 8fe801d59..0f639e1bc 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"