From owner-p4-projects@FreeBSD.ORG  Sat Sep 29 05:21:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D80616A469; Sat, 29 Sep 2007 05:21:12 +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 E135E16A41B
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 05:21:11 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B551913C46E
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 05:21:11 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8T5LBOp020287
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 05:21:11 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8T5LBlO020284
	for perforce@freebsd.org; Sat, 29 Sep 2007 05:21:11 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 29 Sep 2007 05:21:11 GMT
Message-Id: <200709290521.l8T5LBlO020284@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126950 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: Sat, 29 Sep 2007 05:21:12 -0000

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

Change 126950 by kmacy@kmacy_home:ethng on 2007/09/29 05:20:19

	fix ring count to correctly account for prod < cons

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#11 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#11 (text+ko) ====

@@ -72,7 +72,10 @@
 static __inline int
 mbuf_ring_count(struct mbuf_ring *mr)
 {
-	return abs(mr->mr_cons - mr->mr_prod);
+	int size = mr->mr_size;
+	int mask = size - 1;
+	
+	return ((size + mr->mr_prod - mr->mr_cons) & mask);
 }
 
 static __inline int