From owner-p4-projects@FreeBSD.ORG  Wed Dec 15 19:21:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01B7316A4D0; Wed, 15 Dec 2004 19:21:01 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D178B16A4CE
	for <perforce@freebsd.org>; Wed, 15 Dec 2004 19:21:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C0D9B43D53
	for <perforce@freebsd.org>; Wed, 15 Dec 2004 19:21:01 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFJL1TH068339
	for <perforce@freebsd.org>; Wed, 15 Dec 2004 19:21:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFJL1VP068336
	for perforce@freebsd.org; Wed, 15 Dec 2004 19:21:01 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 15 Dec 2004 19:21:01 GMT
Message-Id: <200412151921.iBFJL1VP068336@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>
Subject: PERFORCE change 67138 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 15 Dec 2004 19:21:02 -0000

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

Change 67138 by sam@sam_ebb on 2004/12/15 19:20:51

	for parts that require split keycache entries report the
	the index of the first entry on a mic error so we're
	consistent with parts that don't have split keycache

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#43 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#43 (text+ko) ====

@@ -2608,7 +2608,10 @@
 					    BUS_DMASYNC_POSTREAD);
 					ieee80211_notify_michael_failure(ic,
 					    mtod(m, struct ieee80211_frame *),
-					    ds->ds_rxstat.rs_keyix);
+					    sc->sc_splitmic ?
+					        ds->ds_rxstat.rs_keyix-32 :
+					        ds->ds_rxstat.rs_keyix
+					);
 				}
 			}
 			ifp->if_ierrors++;