From owner-p4-projects@FreeBSD.ORG  Tue Dec 12 23:55:04 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 8483216A417; Tue, 12 Dec 2006 23:55:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5DB1416A415
	for <perforce@freebsd.org>; Tue, 12 Dec 2006 23:55:04 +0000 (UTC)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6187943DC0
	for <perforce@freebsd.org>; Tue, 12 Dec 2006 23:52:25 +0000 (GMT)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBCNriOC032030
	for <perforce@freebsd.org>; Tue, 12 Dec 2006 23:53:44 GMT
	(envelope-from ticso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBCNriBh032026
	for perforce@freebsd.org; Tue, 12 Dec 2006 23:53:44 GMT
	(envelope-from ticso@freebsd.org)
Date: Tue, 12 Dec 2006 23:53:44 GMT
Message-Id: <200612122353.kBCNriBh032026@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ticso@freebsd.org using -f
From: Bernd Walter <ticso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111582 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: Tue, 12 Dec 2006 23:55:04 -0000

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

Change 111582 by ticso@ticso on 2006/12/12 23:53:26

	fix a race in transmit buffer handling

Affected files ...

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

Differences ...

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

@@ -72,7 +72,7 @@
 
 #include "miibus_if.h"
 
-#define ATE_MAX_TX_BUFFERS 64		/* We have ping-pong tx buffers */
+#define ATE_MAX_TX_BUFFERS 2		/* We have ping-pong tx buffers */
 #define ATE_MAX_RX_BUFFERS 64
 
 struct ate_softc
@@ -833,6 +833,9 @@
 		 */
 		BPF_MTAP(ifp, m);
 
+		if (sc->sent_mbuf[sc->txcur] != 0) {
+			panic("ate: sc->sent_mbuf[%i] != 0", sc->txcur);
+		}
 		sc->sent_mbuf[sc->txcur] = m;
 		sc->txcur++;
 	}