X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7d9767f970a4092a66a6ef90e4c084c1f8b63b56..ac74991e5e88789fe6d66bf3194525cd77ddaa4e:/package/broadcom-wl/files/lib/wifi/broadcom.sh

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index aa8258d3d..12002121a 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -124,7 +124,7 @@ enable_broadcom() {
 	config_get maclist "$device" maclist
 	config_get macaddr "$device" macaddr
 	config_get txpower "$device" txpower
-	local vif_pre_up vif_post_up vif_do_up
+	local vif_pre_up vif_post_up vif_do_up vif_txpower
 
 	_c=0
 	nas="$(which nas)"
@@ -153,6 +153,8 @@ enable_broadcom() {
 	esac
 
 	for vif in $vifs; do
+		config_get vif_txpower "$vif" txpower
+
 		config_get mode "$vif" mode
 		append vif_pre_up "vif $_c" "$N"
 		append vif_post_up "vif $_c" "$N"
@@ -231,12 +233,20 @@ enable_broadcom() {
 			append vif_post_up "monitor $monitor" "$N"
 			append vif_post_up "passive $passive" "$N"
 		}
+
+		[ "$mode" = "adhoc" ] && {
+			config_get bssid "$vif" bssid
+			[ -n "$bssid" ] && {
+				append vif_pre_up "des_bssid $bssid" "$N"
+				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"
-		[ -z "$macaddr" ] || append if_up "ifconfig $ifname hw ether $macaddr" ";$N"
+
 		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
@@ -296,7 +306,11 @@ EOF
 	wlc stdin <<EOF
 $vif_do_up
 EOF
-	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
+	# use vif_txpower (from last wifi-iface) instead of txpower (from
+	# wifi-device) if the latter does not exist
+	txpower=${txpower:-$vif_txpower}
+	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm
 
 	eval "$nas_cmd"
 }