From owner-p4-projects@FreeBSD.ORG  Wed Aug 27 15:18:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 96C5B1065686; Wed, 27 Aug 2008 15:18:44 +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 5A3C1106567C
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:18:44 +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 504148FC22
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:18:44 +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 m7RFIics099247
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:18:44 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFIihK099245
	for perforce@freebsd.org; Wed, 27 Aug 2008 15:18:44 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 27 Aug 2008 15:18:44 GMT
Message-Id: <200808271518.m7RFIihK099245@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 148617 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, 27 Aug 2008 15:18:45 -0000

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

Change 148617 by sam@sam_ebb on 2008/08/27 15:18:37

	track crypto changes

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#20 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#20 (text+ko) ====

@@ -685,7 +685,7 @@
 	const struct ieee80211_cipher *cip = wk->wk_cipher;
 	int keylen = wk->wk_keylen;
 
-	if (wk->wk_keyix == IEEE80211_KEYIX_NONE)
+	if ((wk->wk_flags & IEEE80211_KEY_DEVKEY) == 0)
 		return;
 	db_printf(tag, ix);
 	switch (cip->ic_cipher) {
@@ -739,6 +739,10 @@
 				db_printf("%srx", sep), sep = "+";
 			if (wk->wk_flags & IEEE80211_KEY_DEFAULT)
 				db_printf("%sdef", sep), sep = "+";
+			if (wk->wk_flags & IEEE80211_KEY_SWCRYPT)
+				db_printf("%sswcrypt", sep), sep = "+";
+			if (wk->wk_flags & IEEE80211_KEY_SWMIC)
+				db_printf("%sswmic", sep), sep = "+";
 		}
 		db_printf("\n");
 	}