svn commit: r193801 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb

[Kip Macy]

Author: kmacy
Date: Tue Jun  9 04:03:04 2009
New Revision: 193801
URL: http://svn.freebsd.org/changeset/base/193801

Log:
  further limits tweaking

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

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Tue Jun  9 03:47:34 2009	(r193800)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Tue Jun  9 04:03:04 2009	(r193801)
@@ -170,8 +170,7 @@ struct t3_mbuf_hdr {
 #define TX_MAX_DESC                       4     /* max descriptors per packet    */
 
 
-#define TX_START_MIN_DESC (TX_MAX_DESC << 1)
-#define TX_START_MAX_DESC (TX_MAX_DESC << 3)    /* maximum number of descriptors
+#define TX_START_MAX_DESC (TX_MAX_DESC << 2)    /* maximum number of descriptors
 						 * call to start used per 	 */
 
 #define TX_CLEAN_MAX_DESC (TX_MAX_DESC << 4)    /* maximum tx descriptors

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 03:47:34 2009	(r193800)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Tue Jun  9 04:03:04 2009	(r193801)
@@ -1607,7 +1607,7 @@ cxgb_start_locked(struct sge_qset *qs)
 	avail = txq->size - txq->in_use - 4;
 	txmax = min(TX_START_MAX_DESC, avail);
 
-	if (qs->qs_flags & QS_FLUSHING)
+	if (qs->qs_flags & (QS_FLUSHING|QS_TIMEOUT))
 		reclaim_completed_tx(qs, 0, TXQ_ETH);
 		
 	TXQ_LOCK_ASSERT(qs);
@@ -1615,7 +1615,7 @@ cxgb_start_locked(struct sge_qset *qs)
 	    !TXQ_RING_EMPTY(qs) &&
 	    (ifp->if_drv_flags & IFF_DRV_RUNNING) &&
 	    pi->link_config.link_ok) {
-		reclaim_completed_tx(qs, (TX_ETH_Q_SIZE>>6), TXQ_ETH);
+		reclaim_completed_tx(qs, (TX_ETH_Q_SIZE>>5), TXQ_ETH);
 
 		if ((m_head = cxgb_dequeue(qs)) == NULL)
 			break;