From owner-p4-projects@FreeBSD.ORG  Wed Aug 27 15:21:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED3BA106567B; Wed, 27 Aug 2008 15:21:47 +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 B16A01065670
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:21:47 +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 A6EE78FC2B
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:21:47 +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 m7RFLlrS099627
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:21:47 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFLleI099625
	for perforce@freebsd.org; Wed, 27 Aug 2008 15:21:47 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 27 Aug 2008 15:21:47 GMT
Message-Id: <200808271521.m7RFLleI099625@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 148619 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:21:48 -0000

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

Change 148619 by sam@sam_ebb on 2008/08/27 15:20:49

	don't display key indices as +1, show the actual value

Affected files ...

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

Differences ...

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

@@ -691,30 +691,30 @@
 	switch (cip->ic_cipher) {
 	case IEEE80211_CIPHER_WEP:
 		/* compatibility */
-		db_printf(" wepkey %u:%s", wk->wk_keyix+1,
+		db_printf(" wepkey %u:%s", wk->wk_keyix,
 		    keylen <= 5 ? "40-bit" :
 		    keylen <= 13 ? "104-bit" : "128-bit");
 		break;
 	case IEEE80211_CIPHER_TKIP:
 		if (keylen > 128/8)
 			keylen -= 128/8;	/* ignore MIC for now */
-		db_printf(" TKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen);
+		db_printf(" TKIP %u:%u-bit", wk->wk_keyix, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_AES_OCB:
-		db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix+1, 8*keylen);
+		db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_AES_CCM:
-		db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix+1, 8*keylen);
+		db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_CKIP:
-		db_printf(" CKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen);
+		db_printf(" CKIP %u:%u-bit", wk->wk_keyix, 8*keylen);
 		break;
 	case IEEE80211_CIPHER_NONE:
-		db_printf(" NULL %u:%u-bit", wk->wk_keyix+1, 8*keylen);
+		db_printf(" NULL %u:%u-bit", wk->wk_keyix, 8*keylen);
 		break;
 	default:
 		db_printf(" UNKNOWN (0x%x) %u:%u-bit",
-			cip->ic_cipher, wk->wk_keyix+1, 8*keylen);
+			cip->ic_cipher, wk->wk_keyix, 8*keylen);
 		break;
 	}
 	if (memcmp(wk->wk_key, zerodata, keylen) != 0) {