diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-07-03 16:55:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-07-03 16:55:28 +0000 |
| commit | fc3271b73607283fb01718b036a3f11639385d83 (patch) | |
| tree | 1dbbb40f6247ba16938f50ae8e955db0bacebfd2 /sys | |
| parent | f7e420426b56cc831cc9077db2247063a4db4c07 (diff) | |
Support RTL8103E and RTL8168DP which are starting to show up, from brad.
OK from kettenis and sthen after the diff was minimized to have no
potential impact on other chips.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/re.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9reg.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index ec0094aa5af..1b1e1c52068 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.107 2009/06/04 04:48:24 naddy Exp $ */ +/* $OpenBSD: re.c,v 1.108 2009/07/03 16:55:27 deraadt Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -222,6 +222,7 @@ static const struct re_revision { { RL_HWREV_8101E, "RTL8101E" }, { RL_HWREV_8102E, "RTL8102E" }, { RL_HWREV_8102EL, "RTL8102EL" }, + { RL_HWREV_8103E, "RTL8103E" }, { RL_HWREV_8110S, "RTL8110S" }, { RL_HWREV_8139CPLUS, "RTL8139C+" }, { RL_HWREV_8168_SPIN1, "RTL8168 1" }, @@ -231,6 +232,7 @@ static const struct re_revision { { RL_HWREV_8168C_SPIN2, "RTL8168C/8111C" }, { RL_HWREV_8168CP, "RTL8168CP/8111CP" }, { RL_HWREV_8168D, "RTL8168D/8111D" }, + { RL_HWREV_8168DP, "RTL8168DP" }, { RL_HWREV_8169, "RTL8169" }, { RL_HWREV_8169_8110SB, "RTL8169/8110SB" }, { RL_HWREV_8169_8110SBL, "RTL8169SBL" }, @@ -819,6 +821,7 @@ re_attach(struct rl_softc *sc, const char *intrstr) break; case RL_HWREV_8102E: case RL_HWREV_8102EL: + case RL_HWREV_8103E: sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_INVMAR | RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT; @@ -833,6 +836,7 @@ re_attach(struct rl_softc *sc, const char *intrstr) case RL_HWREV_8168C_SPIN2: case RL_HWREV_8168CP: case RL_HWREV_8168D: + case RL_HWREV_8168DP: sc->rl_flags |= RL_FLAG_INVMAR | RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_HWIM; diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h index 4b85c91a949..3c36ee09ace 100644 --- a/sys/dev/ic/rtl81x9reg.h +++ b/sys/dev/ic/rtl81x9reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9reg.h,v 1.62 2009/06/03 00:11:19 sthen Exp $ */ +/* $OpenBSD: rtl81x9reg.h,v 1.63 2009/07/03 16:55:27 deraadt Exp $ */ /* * Copyright (c) 1997, 1998 @@ -163,7 +163,9 @@ #define RL_HWREV_8169_8110SB 0x10000000 #define RL_HWREV_8169_8110SCd 0x18000000 #define RL_HWREV_8102EL 0x24800000 +#define RL_HWREV_8103E 0x24C00000 #define RL_HWREV_8168D 0x28000000 +#define RL_HWREV_8168DP 0x28800000 #define RL_HWREV_8168_SPIN1 0x30000000 #define RL_HWREV_8100E_SPIN1 0x30800000 #define RL_HWREV_8101E 0x34000000 |