[src/netbsd-1-4]: src/sys/dev/mii pullup 1.10->1.11 (thorpej): Fix PR7361

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

details:   https://anonhg.NetBSD.org/src/rev/a169098083e9
branches:  netbsd-1-4
changeset: 468436:a169098083e9
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 23 15:39:09 1999 +0000

description:
pullup 1.10->1.11 (thorpej): Fix PR7361

diffstat:

 sys/dev/mii/inphy.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 80f600c5739b -r a169098083e9 sys/dev/mii/inphy.c
--- a/sys/dev/mii/inphy.c       Fri Apr 23 15:39:00 1999 +0000
+++ b/sys/dev/mii/inphy.c       Fri Apr 23 15:39:09 1999 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: inphy.c,v 1.10 1998/11/05 04:08:02 thorpej Exp $       */
+/*     $NetBSD: inphy.c,v 1.10.6.1 1999/04/23 15:39:09 perry Exp $     */
 
 /*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -77,6 +77,7 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
+#include <sys/errno.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -201,7 +202,7 @@
                         */
                        if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN)
                                return (0);
-                       (void) mii_phy_auto(sc);
+                       (void) mii_phy_auto(sc, 1);
                        break;
                case IFM_100_T4:
                        /*
@@ -255,7 +256,8 @@
 
                sc->mii_ticks = 0;
                mii_phy_reset(sc);
-               (void) mii_phy_auto(sc);
+               if (mii_phy_auto(sc, 0) == EJUSTRETURN)
+                       return (0);
                break;
        }