rc support for vaps

1 files changed, 15 insertions, 11 deletions

diff --git a/etc/rc.d/wpa_supplicant b/etc/rc.d/wpa_supplicant
index 7e724f0..192ca96 100644
--- a/etc/rc.d/wpa_supplicant
+++ b/etc/rc.d/wpa_supplicant
@@ -30,18 +30,21 @@ is_wired_interface()
 	test "$media" = "Ethernet"
 }
 
-case ${ifn} in
-ndis*)
+is_ndis_interface()
+{
+	case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
+		ndis*) true ;;
+		*) false ;;
+	esac
+}
+
+if is_wired_interface ${ifn} ; then
+	driver="wired"
+elif is_ndis_interface ${ifn} ; then
 	driver="ndis"
-	;;
-*)
-	if is_wired_interface ${ifn} ; then
-		driver="wired"
-	else
-		driver="bsd"
-	fi
-	;;
-esac
+else
+	driver="bsd"
+fi
 
 load_rc_config $name
 
@@ -50,5 +53,6 @@ conf_file=${wpa_supplicant_conf_file}
 pidfile="/var/run/${name}/${ifn}.pid"
 command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
 required_files=$conf_file
+required_modules="wlan_wep wlan_tkip wlan_ccmp"
 
 run_rc_command "$1"