41,44d40
< 	# Many wireless interfaces must be brought up before
< 	# they will accept settings or before they will
< 	# associate with AP.
< 	/usr/sbin/ifconfig ${1}
47,48c43,48
< 	if [[ "$WIRELESS_TIMEOUT" = "-1" ]]; then
< 		return 0
---
> 	sleep $WIRELESS_TIMEOUT
> 
> 	bssid=`iwgetid $1 -ra`
> 	if [[ "$bssid" = "00:00:00:00:00:00" ]]; then
> 		printhl "Could not associate $1 - try increasing WIRELESS_TIMEOUT and check network is WEP or has no security"
> 		return 1
50,60c50
< 	for i in $(seq 1 $WIRELESS_TIMEOUT)
< 	do
< 		sleep 1
< 
< 		bssid=`iwgetid $1 -ra`
< 		if [[ "$bssid" != "00:00:00:00:00:00" ]]; then
< 			return 0
< 		fi
< 	done
< 	printhl "Could not associate $1 - try increasing WIRELESS_TIMEOUT and check network is WEP or has no security"
< 	return 1
---
> 	return 0