From owner-p4-projects@FreeBSD.ORG  Thu Jan 10 23:55:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F7A116A420; Thu, 10 Jan 2008 23:55:57 +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 D90C616A41A
	for <perforce@FreeBSD.org>; Thu, 10 Jan 2008 23:55:56 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E53EB13C45B
	for <perforce@FreeBSD.org>; Thu, 10 Jan 2008 23:55:56 +0000 (UTC)
	(envelope-from swise@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 m0ANtuep040669
	for <perforce@FreeBSD.org>; Thu, 10 Jan 2008 23:55:56 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ANtuAJ040666
	for perforce@freebsd.org; Thu, 10 Jan 2008 23:55:56 GMT
	(envelope-from swise@FreeBSD.org)
Date: Thu, 10 Jan 2008 23:55:56 GMT
Message-Id: <200801102355.m0ANtuAJ040666@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 133000 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, 10 Jan 2008 23:55:57 -0000

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

Change 133000 by swise@swise:vic10:iwarp on 2008/01/10 23:55:35

	Fixed genpoll allocator.
	
	It wasn't correctly computing the address to return.

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#7 edit

Differences ...

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#7 (text+ko) ====

@@ -255,7 +255,7 @@
 	if (blkno == SWAPBLK_NONE)
 		return (0);
 
-	return (gp->gen_base + blkno);
+	return (gp->gen_base + ((1 << gp->gen_chunk_shift) * blkno));
 }
 
 #define cxio_wait(ctx, lockp, cond) \
@@ -281,7 +281,7 @@
 	daddr_t blkno;
 	
 	chunks = size >> gp->gen_chunk_shift;
-	blkno = address - gp->gen_base;
+	blkno = (address - gp->gen_base) / (1 << gp->gen_chunk_shift);
 	blist_free(gp->gen_list, blkno, chunks);
 }