From owner-p4-projects@FreeBSD.ORG  Thu Jan  5 08:40:14 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DD67816A423; Thu,  5 Jan 2006 08:40:13 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 9AD1C16A41F
	for <perforce@freebsd.org>; Thu,  5 Jan 2006 08:40:13 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E90743D66
	for <perforce@freebsd.org>; Thu,  5 Jan 2006 08:40:13 +0000 (GMT)
	(envelope-from imp@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 k058eCgK080666
	for <perforce@freebsd.org>; Thu, 5 Jan 2006 08:40:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k058eCtl080663
	for perforce@freebsd.org; Thu, 5 Jan 2006 08:40:12 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 5 Jan 2006 08:40:12 GMT
Message-Id: <200601050840.k058eCtl080663@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89202 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: Thu, 05 Jan 2006 08:40:14 -0000

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

Change 89202 by imp@imp_plunger on 2006/01/05 08:39:31

	compile

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#9 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#9 (text+ko) ====

@@ -328,22 +328,27 @@
 	 */
 	sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE);
 	sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE);
-	sc->mibdata.dot3StatsSingleColliionsFrames += RD4(sc, ETH_SCOL);
-	sc->mibdata.dot3StatsMultipleColliionsFrames += RD4(sc, ETH_MCOL);
-	sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SEQEE);
+	sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL);
+	sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL);
+	sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE);
 	sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE);
 	sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL);
 	sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL);
 	sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE);
-	sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_EJR);
+	sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR);
 	sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC);
 	/*
 	 * not sure where to lump these, so count them against the errors
 	 * for the interface.
 	 */
-	sc->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE);
-	sc->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) +
+	sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE);
+	sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) +
 	    RD4(sc, ETH_USF);
+
+	/*
+	 * Note: I think there's a race btn the use of the stats above and
+	 * clearing them here.  The datasheet is a bit vague on the topic.
+	 */
 	WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_CSR);
 }