summaryrefslogtreecommitdiffstats
path: root/sys/dev/bge
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2012-05-30 20:04:07 +0000
committermarius <marius@FreeBSD.org>2012-05-30 20:04:07 +0000
commit14cb5ed7df10c31c1a14ca7a4c9d718b18556b09 (patch)
tree4e9494863cc0144ca77b5f38ff2cd46c6095960c /sys/dev/bge
parentb57a3bc250a353972d4c15a9a165efc033ec3a73 (diff)
downloadFreeBSD-src-14cb5ed7df10c31c1a14ca7a4c9d718b18556b09.zip
FreeBSD-src-14cb5ed7df10c31c1a14ca7a4c9d718b18556b09.tar.gz
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
Diffstat (limited to 'sys/dev/bge')
-rw-r--r--sys/dev/bge/if_bge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 1f4e5a8d..545d704 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -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)
OpenPOWER on IntegriCloud