From owner-svn-src-user@FreeBSD.ORG  Sat Jun  6 06:11:26 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 361C5106566B;
	Sat,  6 Jun 2009 06:11:26 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24B188FC18;
	Sat,  6 Jun 2009 06:11:26 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n566BQwI050354;
	Sat, 6 Jun 2009 06:11:26 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n566BQvJ050353;
	Sat, 6 Jun 2009 06:11:26 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906060611.n566BQvJ050353@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 6 Jun 2009 06:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193568 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jun 2009 06:11:26 -0000

Author: kmacy
Date: Sat Jun  6 06:11:25 2009
New Revision: 193568
URL: http://svn.freebsd.org/changeset/base/193568

Log:
  return immediately if forcing coalesce

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sat Jun  6 06:03:45 2009	(r193567)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sat Jun  6 06:11:25 2009	(r193568)
@@ -231,8 +231,10 @@ check_pkt_coalesce(struct sge_qset *qs) 
         sc = qs->port->adapter; 
 	fill = &sc->tunq_fill[qs->idx];
 
-	if (cxgb_pcpu_tx_coalesce_force && (*fill == 0))
+	if (cxgb_pcpu_tx_coalesce_force && (*fill == 0)) {
 		*fill = 1;
+		return;
+	}
 	/*
 	 * if the hardware transmit queue is more than 3/4 full
 	 * we mark it as coalescing