summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-07-09 21:32:07 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-07-09 21:32:07 +0000
commit8bd7a2d9d3568620c2af95b3a25059a9bc0e0b0b (patch)
tree95fbdf57f0356c31cfe51f5c81881b2428f9a50e /sys
parente7d1e0f02c282e076d71f80c57056ce2f0264f46 (diff)
rev 1.34
for offloc, use MII_OFFSET_ANY rather than abusing MII_PHY_ANY. From yamt NetBSD
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/mii/mii.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 97b80de859a..686b4d59bb3 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mii.c,v 1.15 2005/01/28 18:27:55 brad Exp $ */
+/* $OpenBSD: mii.c,v 1.16 2005/07/09 21:32:06 brad Exp $ */
/* $NetBSD: mii.c,v 1.19 2000/02/02 17:09:44 thorpej Exp $ */
/*-
@@ -74,7 +74,7 @@ mii_attach(struct device *parent, struct mii_data *mii, int capmask,
int bmsr, offset = 0;
int phymin, phymax;
- if (phyloc != MII_PHY_ANY && offloc != MII_PHY_ANY)
+ if (phyloc != MII_PHY_ANY && offloc != MII_OFFSET_ANY)
panic("mii_attach: phyloc and offloc specified");
if (phyloc == MII_PHY_ANY) {
@@ -159,7 +159,7 @@ mii_activate(struct mii_data *mii, enum devact act, int phyloc, int offloc)
{
struct mii_softc *child;
- if (phyloc != MII_PHY_ANY && offloc != MII_PHY_ANY)
+ if (phyloc != MII_PHY_ANY && offloc != MII_OFFSET_ANY)
panic("mii_activate: phyloc and offloc specified");
if ((mii->mii_flags & MIIF_INITDONE) == 0)