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

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

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

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

diffstat:

 sys/dev/mii/miivar.h |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 17d5fed0b9fc -r e8b1b3ebb999 sys/dev/mii/miivar.h
--- a/sys/dev/mii/miivar.h      Fri Apr 23 15:40:26 1999 +0000
+++ b/sys/dev/mii/miivar.h      Fri Apr 23 15:40:35 1999 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: miivar.h,v 1.7 1998/11/05 04:08:02 thorpej Exp $       */
+/*     $NetBSD: miivar.h,v 1.7.6.1 1999/04/23 15:40:35 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
@@ -128,6 +128,7 @@
 
 /* mii_flags */
 #define        MIIF_NOISOLATE  0x0001          /* do not isolate the PHY */
+#define        MIIF_DOINGAUTO  0x0002          /* doing autonegotiation */
 
 /*
  * Used to attach a PHY to a parent.
@@ -161,7 +162,7 @@
 
 int    mii_media_from_bmcr __P((int));
 
-int    mii_phy_auto __P((struct mii_softc *));
+int    mii_phy_auto __P((struct mii_softc *, int));
 void   mii_phy_reset __P((struct mii_softc *));
 
 void   ukphy_status __P((struct mii_softc *));