PERFORCE change 140226 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=140226

Change 140226 by sam at sam_ebb on 2008/04/18 20:56:37

	auto load crypto modules on hostapd startup

Affected files ...

.. //depot/projects/vap/tools/tools/net80211/scripts/config#5 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#3 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#4 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#4 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#4 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#4 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#4 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#4 edit

Differences ...

==== //depot/projects/vap/tools/tools/net80211/scripts/config#5 (text+ko) ====

@@ -44,3 +44,11 @@
 test -z "$HOSTAPD"	&& HOSTAPD=/usr/sbin/hostapd
 test -z "$WLANWATCH"	&& WLANWATCH=/usr/local/bin/wlanwatch
 test -z "$WLANWDS"	&& WLANWDS=/usr/local/bin/wlanwds
+
+start_hostapd()
+{
+	for m in wlan_xauth wlan_ccmp wlan_tkip wlan_wep; do
+		kldstat -q -m $m || kldload $m
+	done
+	$HOSTAPD $*
+}

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#2 (text+ko) ====

@@ -59,4 +59,4 @@
 
 makeconf $CONF $WPA_WLAN
 #athdebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#3 (text+ko) ====

@@ -52,4 +52,4 @@
 
 makeconf $CONF
 #mwldebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#4 (text+ko) ====

@@ -46,7 +46,7 @@
 #	ifconfig $WIRED up
 
 	makeconf $CONF
-	$HOSTAPD $CONF&
+	start_hostapd $CONF&
 	pid=$!
 	ifconfig
 

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#4 (text+ko) ====

@@ -50,4 +50,4 @@
 
 makeconf $CONF
 #athdebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#4 (text+ko) ====

@@ -50,4 +50,4 @@
 
 makeconf $CONF
 #mwldebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#4 (text+ko) ====

@@ -50,4 +50,4 @@
 
 makeconf $CONF
 #mwldebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#4 (text+ko) ====

@@ -51,4 +51,4 @@
 
 makeconf $CONF
 #mwldebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#4 (text+ko) ====

@@ -51,4 +51,4 @@
 
 makeconf $CONF
 #mwldebug -i $WIRELESS keycache
-$HOSTAPD -K $CONF
+start_hostapd -K $CONF