From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 00:13:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE55B1065682; Fri, 29 Aug 2008 00:13:23 +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 8268F1065679
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:13:23 +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 6A3108FC17
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:13:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0DN18008692
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:13:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0DN2o008690
	for perforce@freebsd.org; Fri, 29 Aug 2008 00:13:23 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 29 Aug 2008 00:13:23 GMT
Message-Id: <200808290013.m7T0DN2o008690@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 148757 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, 29 Aug 2008 00:13:24 -0000

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

Change 148757 by sam@sam_ebb on 2008/08/29 00:13:07

	o delete key after use; otherwise crypto module winges about it
	o use hack at in-kernel clone api to make progress

Affected files ...

.. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#4 edit

Differences ...

==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#4 (text+ko) ====

@@ -229,7 +229,7 @@
 	struct ieee80211_key key;
 	struct mbuf *m = NULL;
 	const struct ieee80211_cipher *cip;
-	int hdrlen;
+	int hdrlen, result = 0;
 
 	printf("%s: ", t->name);
 
@@ -337,12 +337,12 @@
 	}
 	/* XXX check frame length and contents... */
 	printf("PASS\n");
-	return 1;
+	result = 1;
 bad:
 	if (m != NULL)
 		m_freem(m);
 	ieee80211_crypto_delkey(vap, &key);
-	return 0;
+	return result;
 }
 
 /*
@@ -409,7 +409,7 @@
 	icp.icp_opmode = IEEE80211_M_STA;
 
 	strlcpy(ifname, "wlan", sizeof(ifname));
-	error = if_clone_create(ifname, sizeof(ifname), (caddr_t) &icp);
+	error = if_clone_create_sys(ifname, sizeof(ifname), (caddr_t) &icp);
 	if (error != 0) {
 		printf("%s: unable to clone vap (error %d)!\n",
 		    __func__, error);