summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrad <brad@openbsd.org>2008-09-09 00:25:55 +0000
committerbrad <brad@openbsd.org>2008-09-09 00:25:55 +0000
commit599996d2535c2eafe322b51f23cc629f12e41cf8 (patch)
tree81f0b20ff15c4befa3e8cce6e5fec395eef433bc
parentclean warnings on all architectures (diff)
downloadwireguard-openbsd-599996d2535c2eafe322b51f23cc629f12e41cf8.tar.xz
wireguard-openbsd-599996d2535c2eafe322b51f23cc629f12e41cf8.zip
Recognize the Marvell 88E1116R Gig PHY.
From FreeBSD
-rw-r--r--sys/dev/mii/eephy.c4
-rw-r--r--sys/dev/mii/miidevs3
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 8632ca8fca5..617bae5abef 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.44 2008/07/12 05:31:14 brad Exp $ */
+/* $OpenBSD: eephy.c,v 1.45 2008/09/09 00:25:55 brad Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -95,6 +95,8 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1112 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1116,
MII_STR_MARVELL_E1116 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1116R,
+ MII_STR_MARVELL_E1116R },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1118,
MII_STR_MARVELL_E1118 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1149,
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 98304be544d..5adc26f2cba 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.99 2008/08/24 08:23:15 brad Exp $
+$OpenBSD: miidevs,v 1.100 2008/09/09 00:25:55 brad Exp $
/* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
/*-
@@ -191,6 +191,7 @@ model MARVELL E1149 0x000b Marvell 88E1149 Gigabit PHY
model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY
model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY
model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY
+model MARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY
model MARVELL E3016 0x0026 Marvell 88E3016 10/100 PHY
model xxMARVELL E1000_5 0x0002 Marvell 88E1000 5 Gigabit PHY
model xxMARVELL E1000_6 0x0003 Marvell 88E1000 6 Gigabit PHY