svn commit: r191441 - head/sys/dev/e1000

[Kip Macy]

Author: kmacy
Date: Thu Apr 23 21:23:19 2009
New Revision: 191441
URL: http://svn.freebsd.org/changeset/base/191441

Log:
  fix panic when using msix
  
  Pointed out by Nate Whitehorn

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Thu Apr 23 21:19:35 2009	(r191440)
+++ head/sys/dev/e1000/if_em.c	Thu Apr 23 21:23:19 2009	(r191441)
@@ -2986,6 +2986,11 @@ em_allocate_msix(struct adapter *adapter
 	 */
 	TASK_INIT(&adapter->rx_task, 0, em_handle_rx, adapter);
 	TASK_INIT(&adapter->tx_task, 0, em_handle_tx, adapter);
+	/*
+	 * Handle compatibility for msi case for deferral due to
+	 * trylock failure
+	 */
+	TASK_INIT(&adapter->rxtx_task, 0, em_handle_tx, adapter);
 	TASK_INIT(&adapter->link_task, 0, em_handle_link, adapter);
 	adapter->tq = taskqueue_create_fast("em_taskq", M_NOWAIT,
 	    taskqueue_thread_enqueue, &adapter->tq);