Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Jun 2012 19:15:23 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r236483 - stable/7/sys/dev/bge
Message-ID:  <201206021915.q52JFNjU008681@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sat Jun  2 19:15:22 2012
New Revision: 236483
URL: http://svn.freebsd.org/changeset/base/236483

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/7/sys/dev/bge/if_bge.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/bge/if_bge.c
==============================================================================
--- stable/7/sys/dev/bge/if_bge.c	Sat Jun  2 19:15:21 2012	(r236482)
+++ stable/7/sys/dev/bge/if_bge.c	Sat Jun  2 19:15:22 2012	(r236483)
@@ -2372,7 +2372,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,
@@ -2898,8 +2897,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);
 
 	/*
@@ -3045,6 +3042,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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206021915.q52JFNjU008681>