From d9441d7c494ceb75a81f1f0b148d955e1f8cb6ba Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 13 Jul 2008 05:24:05 +0000
Subject: [PATCH] Add some additional hardware revisions from FreeBSD needed
 for upcoming changes and sort list.

---
 sys/dev/ic/re.c         | 29 +++++++++++++++++------------
 sys/dev/ic/rtl81x9reg.h |  9 +++++++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 8b5ab601574..10bafe10af3 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.82 2008/04/20 01:18:02 brad Exp $	*/
+/*	$OpenBSD: re.c,v 1.83 2008/07/13 05:24:05 jsg Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -209,22 +209,27 @@ static const struct re_revision {
 	u_int32_t		re_chipid;
 	const char		*re_name;
 } re_revisions[] = {
-	{ RL_HWREV_8169,	"RTL8169" },
-	{ RL_HWREV_8110S,	"RTL8110S" },
-	{ RL_HWREV_8169S,	"RTL8169S" },
-	{ RL_HWREV_8169_8110SB,	"RTL8169/8110SB" },
-	{ RL_HWREV_8169_8110SCd, "RTL8169/8110SCd" },
-	{ RL_HWREV_8168_SPIN1,	"RTL8168 1" },
+	{ RL_HWREV_8100,	"RTL8100" },
 	{ RL_HWREV_8100E_SPIN1,	"RTL8100E 1" },
+	{ RL_HWREV_8100E_SPIN2, "RTL8100E 2" },
+	{ RL_HWREV_8101,	"RTL8101" },
 	{ RL_HWREV_8101E,	"RTL8101E" },
+	{ RL_HWREV_8102E,	"RTL8102E" },
+	{ RL_HWREV_8102EL,	"RTL8102EL" },
+	{ RL_HWREV_8110S,	"RTL8110S" },
+	{ RL_HWREV_8139CPLUS,	"RTL8139C+" },
+	{ RL_HWREV_8168_SPIN1,	"RTL8168 1" },
 	{ RL_HWREV_8168_SPIN2,	"RTL8168 2" },
 	{ RL_HWREV_8168_SPIN3,	"RTL8168 3" },
-	{ RL_HWREV_8100E_SPIN2, "RTL8100E 2" },
-	{ RL_HWREV_8168C,	"RTL8168C" },
-	{ RL_HWREV_8139CPLUS,	"RTL8139C+" },
-	{ RL_HWREV_8101,	"RTL8101" },
-	{ RL_HWREV_8100,	"RTL8100" },
+	{ RL_HWREV_8168C,	"RTL8168C/8111C" },
+	{ RL_HWREV_8168C_SPIN2,	"RTL8168C/8111C" },
+	{ RL_HWREV_8168CP,	"RTL8168CP/8111CP" },
+	{ RL_HWREV_8169,	"RTL8169" },
+	{ RL_HWREV_8169_8110SB,	"RTL8169/8110SB" },
+	{ RL_HWREV_8169_8110SBL, "RTL8169SBL" },
+	{ RL_HWREV_8169_8110SCd, "RTL8169/8110SCd" },
 	{ RL_HWREV_8169_8110SCe, "RTL8169/8110SCe" },
+	{ RL_HWREV_8169S,	"RTL8169S" },
 
 	{ 0, NULL }
 };
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index 0a044681e3e..ca7bdab6b71 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9reg.h,v 1.47 2008/04/20 01:18:02 brad Exp $	*/
+/*	$OpenBSD: rtl81x9reg.h,v 1.48 2008/07/13 05:24:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -159,13 +159,17 @@
 #define RL_HWREV_8169S		0x04000000
 #define RL_HWREV_8169_8110SB	0x10000000
 #define RL_HWREV_8169_8110SCd	0x18000000
+#define RL_HWREV_8102EL		0x24800000
 #define RL_HWREV_8168_SPIN1	0x30000000
 #define RL_HWREV_8100E_SPIN1	0x30800000
 #define RL_HWREV_8101E		0x34000000
+#define RL_HWREV_8102E		0x34800000
 #define RL_HWREV_8168_SPIN2	0x38000000
 #define RL_HWREV_8168_SPIN3	0x38400000
 #define RL_HWREV_8100E_SPIN2	0x38800000
-#define RL_HWREV_8168C		0x3C000000
+#define RL_HWREV_8168C		0x3c000000
+#define RL_HWREV_8168C_SPIN2	0x3c400000
+#define RL_HWREV_8168CP		0x3c800000
 #define RL_HWREV_8139		0x60000000
 #define RL_HWREV_8139A		0x70000000
 #define RL_HWREV_8139AG		0x70800000
@@ -176,6 +180,7 @@
 #define RL_HWREV_8139CPLUS	0x74800000
 #define RL_HWREV_8101		0x74c00000
 #define RL_HWREV_8100		0x78800000
+#define RL_HWREV_8169_8110SBL	0x7cc00000
 #define RL_HWREV_8169_8110SCe	0x98000000
 
 #define RL_TXDMA_16BYTES	0x00000000
-- 
2.20.1