From owner-p4-projects@FreeBSD.ORG  Thu Feb 21 06:25:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3069C16A406; Thu, 21 Feb 2008 06:25:45 +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 D15E916A400
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 06:25:44 +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 C64E713C447
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 06:25:44 +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 m1L6Pi2p067577
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 06:25:44 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1L6PiIh067574
	for perforce@freebsd.org; Thu, 21 Feb 2008 06:25:44 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 21 Feb 2008 06:25:44 GMT
Message-Id: <200802210625.m1L6PiIh067574@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 135874 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, 21 Feb 2008 06:25:45 -0000

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

Change 135874 by kmacy@kmacy:entropy:iwarp on 2008/02/21 06:24:47

	calculate the number of descriptors correctly for an offload request

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#14 edit

Differences ...

==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#14 (text+ko) ====

@@ -1945,18 +1945,25 @@
 calc_tx_descs_ofld(struct mbuf *m, unsigned int nsegs)
 {
 	unsigned int flits, cnt = 0;
+	int ndescs;
 
+	if (m->m_len <= WR_LEN && nsegs == 0)
+		return (1);                 /* packet fits as immediate data */
 
-	if (m->m_len <= WR_LEN)
-		return 1;                 /* packet fits as immediate data */
-
 	if (m->m_flags & M_IOVEC)
 		cnt = mtomv(m)->mv_count;
+	else
+		cnt = nsegs;
 
 	/* headers */
-	flits = ((uint8_t *)m->m_pkthdr.header - mtod(m, uint8_t *)) / 8;
+	flits = m->m_len / 8;
+
+	ndescs = flits_to_desc(flits + sgl_len(cnt));
+
+	CTR4(KTR_CXGB, "flits=%d sgl_len=%d nsegs=%d ndescs=%d",
+	    flits, sgl_len(cnt), nsegs, ndescs);
 
-	return flits_to_desc(flits + sgl_len(cnt));
+	return (ndescs);
 }
 
 /**