Module Name: src
Committed By: christos
Date: Mon Mar 7 13:58:32 UTC 2011
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
fix typo, and use the parent to determine the offset. From Dave Mills
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/dev/marvell/if_mvgbe.c:1.8
--- src/sys/dev/marvell/if_mvgbe.c:1.7 Sun Mar 6 12:00:16 2011
+++ src/sys/dev/marvell/if_mvgbe.c Mon Mar 7 08:58:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.7 2011/03/06 17:00:16 christos Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.8 2011/03/07 13:58:32 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.7 2011/03/06 17:00:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.8 2011/03/07 13:58:32 christos Exp $");
#include "rnd.h"
@@ -619,7 +619,6 @@
mvgbe_attach(device_t parent, device_t self, void *aux)
{
struct mvgbe_softc *sc = device_private(self);
- struct mvgbec_softc *csc = device_private(parent);
struct marvell_attach_args *mva = aux;
struct mvgbe_txmap_entry *entry;
struct ifnet *ifp;
@@ -767,7 +766,7 @@
ifmedia_init(&sc->sc_mii.mii_media, 0,
mvgbe_mediachange, mvgbe_mediastatus);
mii_attach(self, &sc->sc_mii, 0xffffffff,
- parent == mvgebc0 ? 0 : 1, MII_OFFSET_ANY, 0);
+ MII_PHY_ANY, parent == mvgbec0 ? 0 : 1, 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,