From owner-p4-projects@FreeBSD.ORG  Sat Sep 29 22:40:21 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 03A8F16A41B; Sat, 29 Sep 2007 22:40:21 +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 A3CD916A418
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:40:20 +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 94DB013C455
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:40:20 +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 l8TMeK67050800
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:40:20 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8TMeK7E050797
	for perforce@freebsd.org; Sat, 29 Sep 2007 22:40:20 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 29 Sep 2007 22:40:20 GMT
Message-Id: <200709292240.l8TMeK7E050797@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 126995 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 22:40:21 -0000

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

Change 126995 by kmacy@kmacy_home:ethng on 2007/09/29 22:39:27

	opportunistically coalesce unless disabled

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#23 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#23 (text+ko) ====

@@ -93,7 +93,7 @@
 #endif
 
 extern struct sysctl_oid_list sysctl__hw_cxgb_children;
-static int cxgb_pcpu_tx_coalesce = 0;
+static int cxgb_pcpu_tx_coalesce = 1;
 TUNABLE_INT("hw.cxgb.tx_coalesce", &cxgb_pcpu_tx_coalesce);
 SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce, CTLFLAG_RDTUN, &cxgb_pcpu_tx_coalesce, 0,
     "coalesce small packets into a single work request");
@@ -213,16 +213,10 @@
 		size += m->m_pkthdr.len;
 		m_vec[count++] = m;
 
-#ifndef COALESCE_ALWAYS
-		if (count == TX_WR_COUNT_MAX || (sc->tunq_coalesce == 0) || (cxgb_pcpu_tx_coalesce == 0))
+
+		if (count == TX_WR_COUNT_MAX || (cxgb_pcpu_tx_coalesce == 0))
 			break;
-#else
-		/*
-		 * XXX testing only
-		 */
-		if (count == TX_WR_COUNT_MAX)
-			break;
-#endif		
+
 		coalesced++;
 	}
 	txq->txq_coalesced += coalesced;