Module Name: src
Committed By: christos
Date: Sun Mar 6 17:00:16 UTC 2011
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
don't abuse cf_unit, requested by phone.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/if_mvgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.6 src/sys/dev/marvell/if_mvgbe.c:1.7
--- src/sys/dev/marvell/if_mvgbe.c:1.6 Sat Mar 5 13:28:13 2011
+++ src/sys/dev/marvell/if_mvgbe.c Sun Mar 6 12:00:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.6 2011/03/05 18:28:13 christos Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.7 2011/03/06 17:00:16 christos Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.6 2011/03/05 18:28:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.7 2011/03/06 17:00:16 christos Exp $");
#include "rnd.h"
@@ -184,7 +184,6 @@
struct mvgbec_softc {
device_t sc_dev;
- int sc_unit;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
@@ -355,16 +354,14 @@
sc->sc_dev = self;
sc->sc_iot = mva->mva_iot;
- sc->sc_unit = mva->mva_unit;
if (bus_space_subregion(mva->mva_iot, mva->mva_ioh, mva->mva_offset,
mva->mva_size, &sc->sc_ioh)) {
aprint_error_dev(self, "Cannot map registers\n");
return;
}
- if (sc->sc_unit == 0) {
+ if (mvgbec0 == NULL)
mvgbec0 = self;
- }
phyaddr = 0;
MVGBE_WRITE(sc, MVGBE_PHYADDR, phyaddr);
@@ -770,7 +767,7 @@
ifmedia_init(&sc->sc_mii.mii_media, 0,
mvgbe_mediachange, mvgbe_mediastatus);
mii_attach(self, &sc->sc_mii, 0xffffffff,
- csc->sc_unit, MII_OFFSET_ANY, 0);
+ parent == mvgebc0 ? 0 : 1, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
ifmedia_add(&sc->sc_mii.mii_media,
