summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2005-08-14 01:33:18 +0000
committerjsg <jsg@openbsd.org>2005-08-14 01:33:18 +0000
commit18a6b78f7dd08f9fb82a7fb8647d371290e1ea19 (patch)
tree28371a39a15a02b47ebfe872cde19c44abc7ccce
parentsync (diff)
downloadwireguard-openbsd-18a6b78f7dd08f9fb82a7fb8647d371290e1ea19.tar.xz
wireguard-openbsd-18a6b78f7dd08f9fb82a7fb8647d371290e1ea19.zip
Correct one of the unknown marvell phys which is actually 88E1111-RCJ.
ok brad@
-rw-r--r--sys/dev/mii/eephy.c6
-rw-r--r--sys/dev/mii/miidevs4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 24591232953..457df686882 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.20 2005/08/02 00:21:32 jsg Exp $ */
+/* $OpenBSD: eephy.c,v 1.21 2005/08/14 01:35:09 jsg Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -97,8 +97,8 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1000_5 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_6,
MII_STR_MARVELL_E1000_6 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_7,
- MII_STR_MARVELL_E1000_7 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1111RCJ,
+ MII_STR_MARVELL_E1111RCJ },
{ 0, 0,
NULL },
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 03a5df4824c..ad995047e1a 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.60 2005/08/02 03:46:07 pvalchev Exp $
+$OpenBSD: miidevs,v 1.61 2005/08/14 01:33:18 jsg Exp $
/* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
/*-
@@ -158,7 +158,7 @@ model MARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY
model MARVELL E1000_4 0x0004 Marvell 88E1000S Gigabit PHY
model MARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY
model MARVELL E1000_6 0x0006 Marvell 88E1000 Gigabit PHY
-model MARVELL E1000_7 0x000c Marvell 88E1000 Gigabit PHY
+model MARVELL E1111RCJ 0x000c Marvell 88E1111-RCJ Gigabit PHY
model xxMARVELL E1000_2 0x0002 Marvell 88E1000 Gigabit PHY
model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY
model xxMARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY