From owner-svn-src-user@FreeBSD.ORG  Sat Jun  6 01:27:42 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 EC019106566C;
	Sat,  6 Jun 2009 01:27:42 +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 D9DB28FC0C;
	Sat,  6 Jun 2009 01:27:42 +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 n561RgeM044230;
	Sat, 6 Jun 2009 01:27:42 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n561Rg0u044228;
	Sat, 6 Jun 2009 01:27:42 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906060127.n561Rg0u044228@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 6 Jun 2009 01:27:42 +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: r193559 - in user/kmacy/releng_7_2_fcs/sys/dev/cxgb: .
	sys
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 01:27:43 -0000

Author: kmacy
Date: Sat Jun  6 01:27:42 2009
New Revision: 193559
URL: http://svn.freebsd.org/changeset/base/193559

Log:
  - clear nextpkt on free
  - simplify coalesce check

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

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 00:52:25 2009	(r193558)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sat Jun  6 01:27:42 2009	(r193559)
@@ -1540,7 +1540,7 @@ cxgb_start_locked(struct sge_qset *qs)
 	struct port_info *pi = qs->port;
 	struct adapter *sc = pi->adapter;
 	struct ifnet *ifp = pi->ifp;
-
+	uint64_t *coal = &sc->tunq_coalesce;
 	avail = txq->size - txq->in_use - 4;
 	txmax = min(TX_START_MAX_DESC, avail);
 
@@ -1550,11 +1550,8 @@ cxgb_start_locked(struct sge_qset *qs)
 		reclaim_completed_tx(qs, (TX_ETH_Q_SIZE>>4), TXQ_ETH);
 		check_pkt_coalesce(qs);
 
-		if (sc->tunq_coalesce) {
-			m_head = cxgb_dequeue_chain(qs);
-		} else 
-			m_head = TXQ_RING_DEQUEUE(qs); 
-
+		m_head = (*coal) ? cxgb_dequeue_chain(qs) : TXQ_RING_DEQUEUE(qs); 
+		
 		if (m_head == NULL)
 			break;
 		/*

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h	Sat Jun  6 00:52:25 2009	(r193558)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h	Sat Jun  6 01:27:42 2009	(r193559)
@@ -72,6 +72,7 @@ m_freem_list(struct mbuf *m)
 		n = m->m_nextpkt;
 		if (n != NULL)
 			prefetch(n);
+		m->m_nextpkt = NULL;
 		m_freem(m);
 		m = n;
 	}