svn commit: r236328 - head/sys/dev/bge
Marius Strobl
marius at FreeBSD.org
Wed May 30 20:04:09 UTC 2012
Author: marius
Date: Wed May 30 20:04:07 2012
New Revision: 236328
URL: http://svn.freebsd.org/changeset/base/236328
Log:
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
MFC after: 3 days
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c Wed May 30 20:02:39 2012 (r236327)
+++ head/sys/dev/bge/if_bge.c Wed May 30 20:04:07 2012 (r236328)
@@ -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,
@@ -2869,8 +2868,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);
/*
@@ -3016,6 +3013,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