aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-wl/files/lib
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-01-06 19:28:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-01-06 19:28:07 +0000
commit178721f76bf6e298b36f6cbfc725ea3ce689a57c (patch)
tree72016cc3537dd7524b206cab8c8d44b197efec1d /package/broadcom-wl/files/lib
parent563d234596124a2e8a3f8489b8a82bd018ed87a7 (diff)
downloadupstream-178721f76bf6e298b36f6cbfc725ea3ce689a57c.tar.gz
upstream-178721f76bf6e298b36f6cbfc725ea3ce689a57c.tar.bz2
upstream-178721f76bf6e298b36f6cbfc725ea3ce689a57c.zip
update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly
SVN-Revision: 10137
Diffstat (limited to 'package/broadcom-wl/files/lib')
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh26
1 files changed, 12 insertions, 14 deletions
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index d9b2220e3f..2e6f2e8e42 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -52,7 +52,7 @@ scan_broadcom() {
case "$adhoc:$sta:$apmode" in
1*)
ap=0
- mssid=0
+ mssid=
infra=0
;;
:1:1)
@@ -62,7 +62,7 @@ scan_broadcom() {
:1:)
wet=1
ap=0
- mssid=0
+ mssid=
;;
::)
radio=0
@@ -158,11 +158,11 @@ enable_broadcom() {
config_get k "$vif" key$knr
[ -n "$k" ] || continue
[ "$defkey" = "$knr" ] && def="=" || def=""
- append vif_pre_up "wepkey $def$knr,$k" "$N"
+ append vif_do_up "wepkey $def$knr,$k" "$N"
done
;;
"");;
- *) append vif_pre_up "wepkey =1,$key" "$N";;
+ *) append vif_do_up "wepkey =1,$key" "$N";;
esac
;;
*psk*|*PSK*)
@@ -191,17 +191,15 @@ enable_broadcom() {
nasopts="-r \"\$${vif}_key\" -h $server -p $port"
;;
esac
- append vif_post_up "wsec $wsec" "$N"
- append vif_post_up "wpa_auth $auth" "$N"
- append vif_post_up "wsec_restrict $wsec_r" "$N"
- append vif_post_up "eap_restrict $eap_r" "$N"
+ append vif_do_up "wsec $wsec" "$N"
+ append vif_do_up "wpa_auth $auth" "$N"
+ append vif_do_up "wsec_restrict $wsec_r" "$N"
+ append vif_do_up "eap_restrict $eap_r" "$N"
config_get ssid "$vif" ssid
append vif_post_up "vlan_mode 0" "$N"
append vif_post_up "ssid $ssid" "$N"
- case "$mode" in
- sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
- esac
+ append vif_do_up "ssid $ssid" "$N"
append vif_post_up "enabled 1" "$N"
@@ -221,8 +219,8 @@ enable_broadcom() {
[ "$mode" = "sta" ] && {
nas_mode="-S"
[ -z "$bridge" ] || {
- append vif_pre_up "supplicant 1" "$N"
- append vif_pre_up "passphrase $key" "$N"
+ append vif_post_up "supplicant 1" "$N"
+ append vif_post_up "passphrase $key" "$N"
use_nas=0
}
@@ -236,7 +234,7 @@ enable_broadcom() {
$ifdown
ap $ap
-mssid $mssid
+${mssid:+mssid $mssid}
apsta $apsta
infra $infra
${wet:+wet 1}