From owner-svn-src-user@FreeBSD.ORG  Sat Jun  6 00:08:20 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 0235F106564A;
	Sat,  6 Jun 2009 00:08:20 +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 E4E488FC0C;
	Sat,  6 Jun 2009 00:08:19 +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 n5608JO2042366;
	Sat, 6 Jun 2009 00:08:19 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5608JZd042365;
	Sat, 6 Jun 2009 00:08:19 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906060008.n5608JZd042365@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 6 Jun 2009 00:08:19 +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: r193552 - 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 00:08:20 -0000

Author: kmacy
Date: Sat Jun  6 00:08:19 2009
New Revision: 193552
URL: http://svn.freebsd.org/changeset/base/193552

Log:
  fix list dequeue stop condition

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	Fri Jun  5 23:59:21 2009	(r193551)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sat Jun  6 00:08:19 2009	(r193552)
@@ -1503,7 +1503,7 @@ coalesce_check(struct mbuf *m, void *arg
 	if (*nbytes == 0) {
 		*count = 1;
 		return (1);
-	} else if ((m->m_next != NULL) && (*count > 6))
+	} else if ((m->m_next != NULL) || (*count > 6))
 		return (0);
 	else if (*nbytes + m->m_len <= 10500) {
 		*count += 1;