svn commit: r193559 - in user/kmacy/releng_7_2_fcs/sys/dev/cxgb: . sys

[Kip Macy]

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;
 	}