svn commit: r236482 - stable/8/sys/dev/bge

Marius Strobl marius at FreeBSD.org
Sat Jun 2 19:15:22 UTC 2012


Author: marius
Date: Sat Jun  2 19:15:21 2012
New Revision: 236482
URL: http://svn.freebsd.org/changeset/base/236482

Log:
  MFC: r236328
  
  Try to finally get the point in time at which bge_add_sysctls() is called
  right; it needs to be called before bge_can_use_msi() but in turn requires
  bge_flags to be properly set.
  
  Submitted by:	yongari

Modified:
  stable/8/sys/dev/bge/if_bge.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/dev/bge/if_bge.c
==============================================================================
--- stable/8/sys/dev/bge/if_bge.c	Sat Jun  2 19:13:56 2012	(r236481)
+++ stable/8/sys/dev/bge/if_bge.c	Sat Jun  2 19:15:21 2012	(r236482)
@@ -2368,7 +2368,6 @@ bge_dma_free(struct bge_softc *sc)
 	if (sc->bge_cdata.bge_tx_mtag)
 		bus_dma_tag_destroy(sc->bge_cdata.bge_tx_mtag);
 
-
 	/* Destroy standard RX ring. */
 	if (sc->bge_cdata.bge_rx_std_ring_map)
 		bus_dmamap_unload(sc->bge_cdata.bge_rx_std_ring_tag,
@@ -2894,8 +2893,6 @@ bge_attach(device_t dev)
 	sc = device_get_softc(dev);
 	sc->bge_dev = dev;
 
-	bge_add_sysctls(sc);
-
 	TASK_INIT(&sc->bge_intr_task, 0, bge_intr_task, sc);
 
 	/*
@@ -3041,6 +3038,9 @@ bge_attach(device_t dev)
 		break;
 	}
 
+	/* Add SYSCTLs, requires the chipset family to be set. */
+	bge_add_sysctls(sc);
+
 	/* Set various PHY bug flags. */
 	if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 ||
 	    sc->bge_chipid == BGE_CHIPID_BCM5701_B0)


More information about the svn-src-all mailing list