KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 29136
This commit is contained in:
Jo-Philipp Wich 2011-11-14 21:37:53 +00:00
parent b33f7e264c
commit 5a4f0f84df
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/broadcom-wl/Makefile
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=broadcom-wl PKG_NAME:=broadcom-wl
PKG_VERSION:=5.10.56.27.3 PKG_VERSION:=5.10.56.27.3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

13
package/broadcom-wl/files/lib/wifi/broadcom.sh
View file

@ -245,9 +245,12 @@ enable_broadcom() {
*wpa*) *wpa*)
wsec_r=1 wsec_r=1
eap_r=1 eap_r=1
config_get key "$vif" key config_get auth_server "$vif" auth_server
config_get server "$vif" server [ -z "$auth_server" ] && config_get auth_server "$vif" server
config_get port "$vif" port 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 # wpa version + default cipher
case "$enc" in case "$enc" in
@ -266,8 +269,8 @@ enable_broadcom() {
# group rekey interval # group rekey interval
config_get rekey "$vif" wpa_group_rekey config_get rekey "$vif" wpa_group_rekey
eval "${vif}_key=\"\$key\"" eval "${vif}_key=\"\$auth_secret\""
nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}${rekey:+ -g $rekey}" nasopts="-r \"\$${vif}_key\" -h $auth_server -p ${auth_port:-1812}${rekey:+ -g $rekey}"
;; ;;
esac esac
append vif_do_up "wsec $wsec" "$N" append vif_do_up "wsec $wsec" "$N"