[src/netbsd-6]: src/sys/dev/marvell Pull up following revision(s) (requested ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47ab2a01984a
branches:  netbsd-6
changeset: 775606:47ab2a01984a
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Jan 05 23:32:27 2013 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #766):
        sys/dev/marvell/if_mvgbe.c: revision 1.33
Check wheter an MII PHY is really connected or not.
This change privents panic if MII PHY port is not used.

diffstat:

 sys/dev/marvell/if_mvgbe.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r d15a3b345b59 -r 47ab2a01984a sys/dev/marvell/if_mvgbe.c
--- a/sys/dev/marvell/if_mvgbe.c        Sat Jan 05 23:30:04 2013 +0000
+++ b/sys/dev/marvell/if_mvgbe.c        Sat Jan 05 23:32:27 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mvgbe.c,v 1.16.2.1 2012/11/20 22:26:03 riz Exp $    */
+/*     $NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz 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.16.2.1 2012/11/20 22:26:03 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -398,7 +398,9 @@
                        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;