From owner-p4-projects@FreeBSD.ORG  Fri Apr 18 20:56:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D3371065672; Fri, 18 Apr 2008 20:56:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C388A1065670
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 20:56:38 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B1E3A8FC1A
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 20:56:38 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IKucxi004021
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 20:56:38 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IKucI0004019
	for perforce@freebsd.org; Fri, 18 Apr 2008 20:56:38 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 18 Apr 2008 20:56:38 GMT
Message-Id: <200804182056.m3IKucI0004019@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Apr 2008 20:56:39 -0000

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

Change 140226 by sam@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