From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 00:37:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1D94106567D; Fri, 29 Aug 2008 00:37:48 +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 958441065676
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:37:48 +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 7D2828FC22
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:37:48 +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 m7T0bmJO010684
	for <perforce@freebsd.org>; Fri, 29 Aug 2008 00:37:48 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0bmR5010682
	for perforce@freebsd.org; Fri, 29 Aug 2008 00:37:48 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 29 Aug 2008 00:37:48 GMT
Message-Id: <200808290037.m7T0bmR5010682@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 148760 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:37:49 -0000

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

Change 148760 by sam@sam_ebb on 2008/08/29 00:37:34

	fix count of passed test vectors

Affected files ...

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

Differences ...

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

@@ -394,7 +394,7 @@
 	struct ieee80211_clone_params icp;
 	char ifname[IFNAMSIZ];
 	struct ieee80211vap *vap;
-	int pass = 0, total = 0, i, error, remainder;
+	int pass = 0, total = 0, i, error;
 	uint8_t bands;
 
 	ifp = if_alloc(IFT_IEEE80211);
@@ -442,8 +442,11 @@
 	for (i = 0; i < N(tkiptests); i++)
 		if (tests & (1<<i)) {
 			total++;
-			for (remainder = 0; remainder < 4; remainder++)
-				pass += runtest(vap, &tkiptests[i], remainder);
+			if (runtest(vap, &tkiptests[i], 0) &&
+			    runtest(vap, &tkiptests[i], 1) &&
+			    runtest(vap, &tkiptests[i], 2) &&
+			    runtest(vap, &tkiptests[i], 3))
+				pass++;
 		}
 	printf("%u of %u 802.11i TKIP test vectors passed\n", pass, total);
 bad: