X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ff38bbf65ab2c500c3db8ff13461393405abe5c9..07790ddaf99fbccbf417ca931d74cee1241030ce:/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 fc26d076e..8b0212582 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -200,9 +200,18 @@ enable_broadcom() {
 		}
 		[ -z "$nasopts" ] || {
 			eval "${vif}_ssid=\"\$ssid\""
-			mode="-A"
-			[ "$vif" = "$sta_if" ] && mode="-S"
-			[ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+			nas_mode="-A"
+			use_nas=1
+			[ "$mode" = "sta" ] && {
+				nas_mode="-S"
+				[ -z "$bridge" ] || {
+					append vif_pre_up "supplicant 1" "$N"
+					append vif_pre_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 &"
 		}
 		_c=$(($_c + 1))
 	done
@@ -249,7 +258,8 @@ detect_broadcom() {
 config wifi-device  wl0
 	option type     broadcom
 	option channel  5
-# disable radio to prevent an open ap after reflashing:
+
+	# REMOVE THIS LINE TO ENABLE WIFI:
 	option disabled 1
 
 config wifi-iface
@@ -257,8 +267,6 @@ config wifi-iface
 	option network	lan
 	option mode     ap
 	option ssid     OpenWrt
-	option hidden   0
 	option encryption none
-
 EOF
 }