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

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

details:   https://anonhg.NetBSD.org/src/rev/24fd2a743082
branches:  netbsd-1-4
changeset: 468442:24fd2a743082
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 23 15:40:56 1999 +0000

description:
pullup 1.8->1.9 (thorpej): Fix PR7361

diffstat:

 sys/dev/mii/icsphy.c |   6 +++---
 sys/dev/mii/sqphy.c  |  10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r e8b1b3ebb999 -r 24fd2a743082 sys/dev/mii/icsphy.c
--- a/sys/dev/mii/icsphy.c      Fri Apr 23 15:40:35 1999 +0000
+++ b/sys/dev/mii/icsphy.c      Fri Apr 23 15:40:56 1999 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: icsphy.c,v 1.8 1998/11/05 04:08:01 thorpej Exp $       */
+/*     $NetBSD: icsphy.c,v 1.8.6.1 1999/04/23 15:40:56 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
@@ -193,7 +193,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:
                        /*
diff -r e8b1b3ebb999 -r 24fd2a743082 sys/dev/mii/sqphy.c
--- a/sys/dev/mii/sqphy.c       Fri Apr 23 15:40:35 1999 +0000
+++ b/sys/dev/mii/sqphy.c       Fri Apr 23 15:40:56 1999 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: sqphy.c,v 1.8 1998/11/05 04:08:02 thorpej Exp $        */
+/*     $NetBSD: sqphy.c,v 1.8.6.1 1999/04/23 15:41:25 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>
@@ -192,7 +193,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:
                        /*
@@ -246,7 +247,8 @@
 
                sc->mii_ticks = 0;
                mii_phy_reset(sc);
-               (void) mii_phy_auto(sc);
+               if (mii_phy_auto(sc, 0) == EJUSTRETURN)
+                       return (0);
                break;
        }