Module Name: src
Committed By: msaitoh
Date: Thu Dec 20 10:01:28 UTC 2012
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
Check wheter an MII PHY is really connected or not.
This change privents panic if MII PHY port is not used.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 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.32 src/sys/dev/marvell/if_mvgbe.c:1.33
--- src/sys/dev/marvell/if_mvgbe.c:1.32 Fri Nov 9 09:04:19 2012
+++ src/sys/dev/marvell/if_mvgbe.c Thu Dec 20 10:01:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.32 2012/11/09 09:04:19 msaitoh Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.33 2012/12/20 10:01:28 msaitoh 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.32 2012/11/09 09:04:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.33 2012/12/20 10:01:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -429,7 +429,9 @@ mvgbec_attach(device_t parent, device_t
if (child) {
port = device_private(child);
mii = LIST_FIRST(&port->sc_mii.mii_phys);
- phyaddr |= MVGBE_PHYADDR_PHYAD(j, mii->mii_phy);
+ if (mii != NULL)
+ phyaddr |= MVGBE_PHYADDR_PHYAD(j,
+ mii->mii_phy);
}
}
break;
