X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbroadcom-wl%2Ffiles%2Flib%2Fwifi%2Fbroadcom.sh;h=976665cb0b4ef777c4890efb6334f35e4066dc8f;hp=f5d15f841d4b78dc89f2c84d967e9bb485198b68;hb=bbb7850ae6487bc97e09ddb24ba32b59df4b0d7e;hpb=d5d8a225f886ebe776a75d5a877a5af96f658abf

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index f5d15f841d..976665cb0b 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -42,7 +42,7 @@ scan_broadcom() {
 
 	local _c=
 	for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
-		config_set "$vif" ifname "wl0${_c:+.$_c}"
+		config_set "$vif" ifname "${device}${_c:+.$_c}"
 		_c=$((${_c:-0} + 1))
 	done
 	config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
@@ -93,13 +93,14 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
-	set_wifi_down "$1"
-	wlc down
+	local device="$1"
+	set_wifi_down "$device"
+	wlc ifname "$device" down
 	(
 		include /lib/network
 
 		# make sure the interfaces are down and removed from all bridges
-		for dev in wl0 wl0.1 wl0.2 wl0.3; do
+		for dev in $device ${device}.1 ${device}.2 ${device}.3; do
 			ifconfig "$dev" down 2>/dev/null >/dev/null && {
 				unbridge "$dev"
 			}
@@ -109,6 +110,7 @@ disable_broadcom() {
 }
 
 enable_broadcom() {
+	local device="$1"
 	local _c
 	config_get channel "$device" channel
 	config_get country "$device" country
@@ -126,6 +128,7 @@ enable_broadcom() {
 	config_get txpower "$device" txpower
 	config_get frag "$device" frag
 	config_get rts "$device" rts
+	config_get hwmode "$device" hwmode
 	local vif_pre_up vif_post_up vif_do_up vif_txpower
 	local doth=0
 	local wmm=0
@@ -156,6 +159,15 @@ enable_broadcom() {
 		;;
 	esac
 
+	case "$hwmode" in
+		*b)   hwmode=0;;
+		*bg)  hwmode=1;;
+		*g)   hwmode=2;;
+		*gst) hwmode=4;;
+		*lrs) hwmode=5;;
+		*)    hwmode=1;;
+	esac
+
 	for vif in $vifs; do
 		config_get vif_txpower "$vif" txpower
 
@@ -181,11 +193,15 @@ enable_broadcom() {
 		nasopts=
 		config_get enc "$vif" encryption
 		case "$enc" in
-			WEP|wep)
+			*WEP*|*wep*)
 				wsec_r=1
 				wsec=1
 				defkey=1
 				config_get key "$vif" key
+				case "$enc" in
+					*shared*) append vif_do_up "wepauth 1" "$N";;
+					*) append vif_do_up "wepauth 0" "$N";;
+				esac
 				case "$key" in
 					[1234])
 						defkey="$key"
@@ -231,7 +247,7 @@ enable_broadcom() {
 		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"
@@ -249,9 +265,9 @@ enable_broadcom() {
 				append vif_pre_up "allow_mode 1" "$N"
 			}
 		} || append vif_pre_up "allow_mode 0" "$N"
-		
+
 		append vif_post_up "enabled 1" "$N"
-		
+
 		config_get ifname "$vif" ifname
 		#append if_up "ifconfig $ifname up" ";$N"
 
@@ -271,18 +287,21 @@ enable_broadcom() {
 				[ -z "$bridge" ] || {
 					append vif_post_up "supplicant 1" "$N"
 					append vif_post_up "passphrase $key" "$N"
-					
+
 					use_nas=0
 				}
 			}
-			[ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+			[ -z "$nas" -o "$use_nas" = "0" ] || {
+				nas_cmd="${nas_cmd:+$nas_cmd$N}start-stop-daemon -S -b -p /var/run/nas.$ifname.pid -x $nas -- -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts"
+			}
 		}
 		_c=$(($_c + 1))
 	done
 	killall -KILL nas >&- 2>&-
-	wlc stdin <<EOF
+	wlc ifname "$device" stdin <<EOF
 $ifdown
 
+gmode ${hwmode:-1}
 apsta $apsta
 ap $ap
 ${mssid:+mssid $mssid}
@@ -314,7 +333,7 @@ up
 $vif_post_up
 EOF
 	eval "$if_up"
-	wlc stdin <<EOF
+	wlc ifname "$device" stdin <<EOF
 $vif_do_up
 EOF
 
@@ -328,11 +347,13 @@ EOF
 
 
 detect_broadcom() {
-	[ -f /proc/net/wl0 ] || return
-	config_get type wl0 type
-	[ "$type" = broadcom ] && return
-	cat <<EOF
-config wifi-device  wl0
+	local i=-1
+
+	while [ -f /proc/net/wl$((++i)) ]; do
+		config_get type wl${i} type
+		[ "$type" = broadcom ] && continue
+		cat <<EOF
+config wifi-device  wl${i}
 	option type     broadcom
 	option channel  5
 
@@ -340,10 +361,12 @@ config wifi-device  wl0
 	option disabled 1
 
 config wifi-iface
-	option device   wl0
+	option device   wl${i}
 	option network	lan
 	option mode     ap
-	option ssid     OpenWrt
+	option ssid     OpenWrt${i#0}
 	option encryption none
+
 EOF
+	done
 }