From owner-p4-projects@FreeBSD.ORG  Sat Sep 29 22:37:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 479E016A41B; Sat, 29 Sep 2007 22:37:17 +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 E979416A418
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:37:16 +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 DAA5813C447
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:37:16 +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 l8TMbGND050642
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 22:37:16 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8TMbGNV050639
	for perforce@freebsd.org; Sat, 29 Sep 2007 22:37:16 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 29 Sep 2007 22:37:16 GMT
Message-Id: <200709292237.l8TMbGNV050639@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 126994 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:37:17 -0000

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

Change 126994 by kmacy@kmacy_home:ethng on 2007/09/29 22:36:57

	don't defer immediate send if enough packets have been enqueued

Affected files ...

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

Differences ...

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

@@ -135,6 +135,7 @@
 	if (((prod + 1) & mask) != cons) {
 		mr->mr_ring[prod] = m;
 		mr->mr_prod = (prod + 1) & mask;
+		mb();
 	} else {
 		txq->txq_drops++;
 		err = ENOBUFS;
@@ -497,7 +498,7 @@
 	
 	txq = &qs->txq[TXQ_ETH];
 
-	if ((sc->tunq_coalesce == 0) && mtx_trylock(&txq->lock)) {
+	if (((sc->tunq_coalesce == 0) || (mbuf_ring_count(&txq->txq_mr) > TX_WR_COUNT_MAX)) && mtx_trylock(&txq->lock)) {
 		txq->flags |= TXQ_TRANSMITTING;
 		err = cxgb_pcpu_start_(qs, immpkt, FALSE);
 		txq->flags &= ~TXQ_TRANSMITTING;