From owner-p4-projects@FreeBSD.ORG  Wed Apr 16 03:51:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D98F2106567B; Wed, 16 Apr 2008 03:51:27 +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 9BFEB1065678
	for <perforce@freebsd.org>; Wed, 16 Apr 2008 03:51:27 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B9428FC1D
	for <perforce@freebsd.org>; Wed, 16 Apr 2008 03:51:27 +0000 (UTC)
	(envelope-from thompsa@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 m3G3pRh2063774
	for <perforce@freebsd.org>; Wed, 16 Apr 2008 03:51:27 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3G3pRfE063772
	for perforce@freebsd.org; Wed, 16 Apr 2008 03:51:27 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 16 Apr 2008 03:51:27 GMT
Message-Id: <200804160351.m3G3pRfE063772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140097 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: Wed, 16 Apr 2008 03:51:28 -0000

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

Change 140097 by thompsa@thompsa_burger on 2008/04/16 03:50:53

	Add a test for the vap parent being a ndis interface and use the
	appropriate wpa_supplicant driver.

Affected files ...

.. //depot/projects/vap/etc/rc.d/wpa_supplicant#8 edit

Differences ...

==== //depot/projects/vap/etc/rc.d/wpa_supplicant#8 (text+ko) ====

@@ -30,18 +30,21 @@
 	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