summaryrefslogtreecommitdiff
path: root/sys/dev/mii/ukphy.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/mii/ukphy.c')
-rw-r--r--sys/dev/mii/ukphy.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 035a5a5d2dd..6ae8a128791 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ukphy.c,v 1.2 1999/05/31 22:13:47 millert Exp $ */
-/* $NetBSD: ukphy.c,v 1.1 1998/11/05 00:36:48 thorpej Exp $ */
+/* $OpenBSD: ukphy.c,v 1.3 1999/07/16 14:59:07 jason Exp $ */
+/* $NetBSD: ukphy.c,v 1.1.6.1 1999/04/23 15:39:00 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>
@@ -204,7 +205,7 @@ ukphy_service(sc, mii, cmd)
*/
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:
/*
@@ -258,7 +259,8 @@ ukphy_service(sc, mii, cmd)
sc->mii_ticks = 0;
mii_phy_reset(sc);
- (void) mii_phy_auto(sc);
+ if (mii_phy_auto(sc, 0) == EJUSTRETURN)
+ return (0);
break;
}