diff options
| author |   pvalchev <pvalchev@openbsd.org> | 2007-06-06 18:51:19 +0000 |
|---|---|---|
| committer | pvalchev <pvalchev@openbsd.org> | 2007-06-06 18:51:19 +0000 |
| commit | 8022f0953baa2def81e415df2097d18c7a44b198 (patch) | |
| tree | f7a9a69bd6d8dd6ce85f8d7353fa4e29d550188e /sys/dev | |
| parent | Do not dereference a garbage pointer in hci_acl_send() (diff) | |
| download | wireguard-openbsd-8022f0953baa2def81e415df2097d18c7a44b198.tar.xz wireguard-openbsd-8022f0953baa2def81e415df2097d18c7a44b198.zip | |
- Recognize the 8110SCe 8169 revision in re(4)
- Rename the existing 8110SC revision to 8110SCd to be consistent
info from the linux driver via Brad
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/re.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9reg.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 240cbb08b23..cd446af47b3 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.71 2007/05/08 21:19:42 deraadt Exp $ */ +/* $OpenBSD: re.c,v 1.72 2007/06/06 18:51:19 pvalchev Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -213,7 +213,7 @@ static const struct re_revision { { RL_HWREV_8110S, "RTL8110S" }, { RL_HWREV_8169S, "RTL8169S" }, { RL_HWREV_8169_8110SB, "RTL8169/8110SB" }, - { RL_HWREV_8169_8110SC, "RTL8169/8110SC" }, + { RL_HWREV_8169_8110SCd, "RTL8169/8110SCd" }, { RL_HWREV_8168_SPIN1, "RTL8168 1" }, { RL_HWREV_8100E_SPIN1, "RTL8100E 1" }, { RL_HWREV_8101E, "RTL8101E" }, @@ -222,6 +222,7 @@ static const struct re_revision { { RL_HWREV_8139CPLUS, "RTL8139C+" }, { RL_HWREV_8101, "RTL8101" }, { RL_HWREV_8100, "RTL8100" }, + { RL_HWREV_8169_8110SCe, "RTL8169/8110SCe" }, { 0, NULL } }; diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h index fb308ac9d9e..e12eeb592ac 100644 --- a/sys/dev/ic/rtl81x9reg.h +++ b/sys/dev/ic/rtl81x9reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9reg.h,v 1.37 2007/05/08 18:49:32 deraadt Exp $ */ +/* $OpenBSD: rtl81x9reg.h,v 1.38 2007/06/06 18:51:19 pvalchev Exp $ */ /* * Copyright (c) 1997, 1998 @@ -152,7 +152,7 @@ #define RL_HWREV_8110S 0x00800000 #define RL_HWREV_8169S 0x04000000 #define RL_HWREV_8169_8110SB 0x10000000 -#define RL_HWREV_8169_8110SC 0x18000000 +#define RL_HWREV_8169_8110SCd 0x18000000 #define RL_HWREV_8168_SPIN1 0x30000000 #define RL_HWREV_8100E_SPIN1 0x30800000 #define RL_HWREV_8101E 0x34000000 @@ -168,6 +168,7 @@ #define RL_HWREV_8139CPLUS 0x74800000 #define RL_HWREV_8101 0x74c00000 #define RL_HWREV_8100 0x78800000 +#define RL_HWREV_8169_8110SCe 0x98000000 #define RL_TXDMA_16BYTES 0x00000000 #define RL_TXDMA_32BYTES 0x00000100 |