From owner-svn-src-user@FreeBSD.ORG  Tue Jun  9 01:21:49 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 F03F41065677;
	Tue,  9 Jun 2009 01:21:49 +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 DE95B8FC0A;
	Tue,  9 Jun 2009 01:21:49 +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 n591Ln3D051040;
	Tue, 9 Jun 2009 01:21:49 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n591Ln06051039;
	Tue, 9 Jun 2009 01:21:49 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906090121.n591Ln06051039@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 9 Jun 2009 01:21:49 +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: r193793 - 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: Tue, 09 Jun 2009 01:21:50 -0000

Author: kmacy
Date: Tue Jun  9 01:21:49 2009
New Revision: 193793
URL: http://svn.freebsd.org/changeset/base/193793

Log:
  don't disable coalesce in watchdog

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	Tue Jun  9 01:07:06 2009	(r193792)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Tue Jun  9 01:21:49 2009	(r193793)
@@ -229,8 +229,6 @@ check_pkt_coalesce(struct sge_qset *qs) 
 
 	if (__predict_false(cxgb_pcpu_tx_coalesce_force))
 		return (1);
-	if (__predict_false(qs->qs_flags & QS_FLUSHING))
-		return (0);
 	txq = &qs->txq[TXQ_ETH]; 
         sc = qs->port->adapter; 
 	fill = &sc->tunq_fill[qs->idx];