From owner-p4-projects@FreeBSD.ORG  Mon Sep 17 20:24:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D0C7316A41B; Mon, 17 Sep 2007 20:24:10 +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 A28D616A418
	for <perforce@freebsd.org>; Mon, 17 Sep 2007 20:24:10 +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 A9CB113C468
	for <perforce@freebsd.org>; Mon, 17 Sep 2007 20:24:10 +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 l8HKOAxH077883
	for <perforce@freebsd.org>; Mon, 17 Sep 2007 20:24:10 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8HKOArC077880
	for perforce@freebsd.org; Mon, 17 Sep 2007 20:24:10 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 17 Sep 2007 20:24:10 GMT
Message-Id: <200709172024.l8HKOArC077880@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 126531 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: Mon, 17 Sep 2007 20:24:11 -0000

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

Change 126531 by kmacy@kmacy:storage:toestack on 2007/09/17 20:23:46

	IFC 126529
	pull in missed changed to adapter structure and comment out MINCLSIZE
	until mbuf free optimization complete

Affected files ...

.. //depot/projects/toestack/sys/amd64/conf/MULTIQ#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#5 integrate

Differences ...

==== //depot/projects/toestack/sys/amd64/conf/MULTIQ#4 (text+ko) ====

@@ -214,5 +214,5 @@
 options		ALT_BREAK_TO_DEBUGGER
 #options		LOCK_PROFILING
 options		HWPMC_HOOKS
-options		MINCLSIZE	48
+#options		MINCLSIZE	48
 

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#5 (text+ko) ====

@@ -275,6 +275,11 @@
 	bus_dmamap_t	desc_map;
 	bus_dma_tag_t   entry_tag;
 	struct mbuf_head sendq;
+	/*
+	 * cleanq should really be an mbuf_ring to avoid extra
+	 * mbuf touches
+	 */
+	struct mbuf_head cleanq;	
 	struct mbuf_ring txq_mr;
 	uint32_t        txq_drops;
 	uint32_t        txq_skipped;