svn commit: r205446 - stable/6/sys/dev/mxge

[Andrew Gallatin]

Author: gallatin
Date: Mon Mar 22 13:21:52 2010
New Revision: 205446
URL: http://svn.freebsd.org/changeset/base/205446

Log:
  MFC 205255: Fix 2 bugs in mxge_attach()

Modified:
  stable/6/sys/dev/mxge/if_mxge.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/dev/mxge/if_mxge.c
==============================================================================
--- stable/6/sys/dev/mxge/if_mxge.c	Mon Mar 22 13:20:25 2010	(r205445)
+++ stable/6/sys/dev/mxge/if_mxge.c	Mon Mar 22 13:21:52 2010	(r205446)
@@ -4329,8 +4329,6 @@ mxge_attach(device_t dev)
 		err = ENOMEM;
 		goto abort_with_nothing;
 	}
-	taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq",
-				device_get_nameunit(sc->dev));
 
 	err = bus_dma_tag_create(NULL,			/* parent */
 				 1,			/* alignment */
@@ -4436,7 +4434,7 @@ mxge_attach(device_t dev)
 	err = mxge_alloc_rings(sc);
 	if (err != 0) {
 		device_printf(sc->dev, "failed to allocate rings\n");
-		goto abort_with_dmabench;
+		goto abort_with_slices;
 	}
 
 	err = mxge_add_irq(sc);
@@ -4482,6 +4480,8 @@ mxge_attach(device_t dev)
 		mxge_change_mtu(sc, mxge_initial_mtu);
 
 	mxge_add_sysctls(sc);
+	taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq",
+				device_get_nameunit(sc->dev));
 	callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc);
 	return 0;