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

[Kip Macy]

Author: kmacy
Date: Tue Jun  9 02:58:57 2009
New Revision: 193797
URL: http://svn.freebsd.org/changeset/base/193797

Log:
  - restore max descriptors per call to cxgb_start_locked
  - remove unused defines
  - don't always clean in tx timeout

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
  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_adapter.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Tue Jun  9 02:27:59 2009	(r193796)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Tue Jun  9 02:58:57 2009	(r193797)
@@ -84,8 +84,6 @@ extern int cxgb_debug;
 #else
 #define MTX_INIT mtx_init
 #define MTX_DESTROY mtx_destroy
-#define SX_INIT sx_init
-#define SX_DESTROY sx_destroy
 #endif
 
 struct port_info {
@@ -270,6 +268,7 @@ enum {
 #define QS_RUNNING              0x2
 #define QS_BOUND                0x4
 #define	QS_FLUSHING		0x8
+#define	QS_TIMEOUT		0x10
 
 struct sge_qset {
 	struct sge_rspq		rspq;

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 02:27:59 2009	(r193796)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h	Tue Jun  9 02:58:57 2009	(r193797)
@@ -170,8 +170,8 @@ 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 << 2)    /* maximum number of descriptors
+#define TX_START_MIN_DESC (TX_MAX_DESC << 1)
+#define TX_START_MAX_DESC (TX_MAX_DESC << 3)    /* 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 02:27:59 2009	(r193796)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Tue Jun  9 02:58:57 2009	(r193797)
@@ -1580,9 +1580,9 @@ cxgb_tx_timeout(void *arg)
 	struct sge_qset *qs = arg;
 
 	if (TXQ_TRYLOCK(qs)) {
-		qs->qs_flags |= QS_FLUSHING;
+		qs->qs_flags |= QS_TIMEOUT;
 		cxgb_start_locked(qs);
-		qs->qs_flags &= ~QS_FLUSHING;
+		qs->qs_flags &= ~QS_TIMEOUT;
 		TXQ_UNLOCK(qs);
 	}
 }