PERFORCE change 126995 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=126995

Change 126995 by kmacy at kmacy_home:ethng on 2007/09/29 22:39:27

	opportunistically coalesce unless disabled

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#23 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#23 (text+ko) ====

@@ -93,7 +93,7 @@
 #endif
 
 extern struct sysctl_oid_list sysctl__hw_cxgb_children;
-static int cxgb_pcpu_tx_coalesce = 0;
+static int cxgb_pcpu_tx_coalesce = 1;
 TUNABLE_INT("hw.cxgb.tx_coalesce", &cxgb_pcpu_tx_coalesce);
 SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce, CTLFLAG_RDTUN, &cxgb_pcpu_tx_coalesce, 0,
     "coalesce small packets into a single work request");
@@ -213,16 +213,10 @@
 		size += m->m_pkthdr.len;
 		m_vec[count++] = m;
 
-#ifndef COALESCE_ALWAYS
-		if (count == TX_WR_COUNT_MAX || (sc->tunq_coalesce == 0) || (cxgb_pcpu_tx_coalesce == 0))
+
+		if (count == TX_WR_COUNT_MAX || (cxgb_pcpu_tx_coalesce == 0))
 			break;
-#else
-		/*
-		 * XXX testing only
-		 */
-		if (count == TX_WR_COUNT_MAX)
-			break;
-#endif		
+
 		coalesced++;
 	}
 	txq->txq_coalesced += coalesced;