svn commit: r185196 - user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb

[Kip Macy]

Author: kmacy
Date: Sun Nov 23 00:27:16 2008
New Revision: 185196
URL: http://svn.freebsd.org/changeset/base/185196

Log:
  - re-enable coalescing by default
  - remove intr_machdep.h include

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c
  user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_multiq.c

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c	Sun Nov 23 00:23:58 2008	(r185195)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c	Sun Nov 23 00:27:16 2008	(r185196)
@@ -82,10 +82,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/priv.h>
 #endif
 
-#ifdef IFNET_MULTIQUEUE
-#include <machine/intr_machdep.h>
-#endif
-
 static int cxgb_setup_msix(adapter_t *, int);
 static void cxgb_teardown_msix(adapter_t *);
 static void cxgb_init(void *);

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_multiq.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_multiq.c	Sun Nov 23 00:23:58 2008	(r185195)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_multiq.c	Sun Nov 23 00:27:16 2008	(r185196)
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
 
 extern int txq_fills;
 int multiq_tx_enable = 1;
-int coalesce_tx_enable = 0;
+int coalesce_tx_enable = 1;
 int wakeup_tx_thread = 0;
 
 extern struct sysctl_oid_list sysctl__hw_cxgb_children;