Some fixes for re(4) chipset identification..
- Rename 8168 revision entries to 8168B to reflect proper naming. From FreeBSD
- Change 8168C_SPIN2 rev string to differentiate from the first rev.
- Change 8169SBL ident string to also mention the 8110 chipset so the
naming is consistent with the same family of chipsets.
- Remove tab in front of 8103E define in the header.
Index: re.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ic/re.c,v
retrieving revision 1.136
diff -u -p -r1.136 re.c
--- re.c 15 Jun 2011 13:19:19 -0000 1.136
+++ re.c 15 Jun 2011 22:37:37 -0000
@@ -230,11 +230,11 @@ static const struct re_revision {
{ RL_HWREV_8103E, "RTL8103E" },
{ 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_8168B_SPIN1, "RTL8168B 1" },
+ { RL_HWREV_8168B_SPIN2, "RTL8168B 2" },
+ { RL_HWREV_8168B_SPIN3, "RTL8168B 3" },
{ RL_HWREV_8168C, "RTL8168C/8111C" },
- { RL_HWREV_8168C_SPIN2, "RTL8168C/8111C" },
+ { RL_HWREV_8168C_SPIN2, "RTL8168C/8111C 2" },
{ RL_HWREV_8168CP, "RTL8168CP/8111CP" },
{ RL_HWREV_8105E, "RTL8105E" },
{ RL_HWREV_8168D, "RTL8168D/8111D" },
@@ -243,7 +243,7 @@ static const struct re_revision {
{ RL_HWREV_8168E_VL, "RTL8168E/8111E-VL" },
{ RL_HWREV_8169, "RTL8169" },
{ RL_HWREV_8169_8110SB, "RTL8169/8110SB" },
- { RL_HWREV_8169_8110SBL, "RTL8169SBL" },
+ { RL_HWREV_8169_8110SBL, "RTL8169/8110SBL" },
{ RL_HWREV_8169_8110SCd, "RTL8169/8110SCd" },
{ RL_HWREV_8169_8110SCe, "RTL8169/8110SCe" },
{ RL_HWREV_8169S, "RTL8169S" },
Index: rtl81x9reg.h
===================================================================
RCS file: /home/cvs/src/sys/dev/ic/rtl81x9reg.h,v
retrieving revision 1.74
diff -u -p -r1.74 rtl81x9reg.h
--- rtl81x9reg.h 14 Apr 2011 21:06:38 -0000 1.74
+++ rtl81x9reg.h 15 Jun 2011 22:39:22 -0000
@@ -172,13 +172,13 @@
#define RL_HWREV_8168DP 0x28800000
#define RL_HWREV_8168E 0x2C000000
#define RL_HWREV_8168E_VL 0x2C800000
-#define RL_HWREV_8168_SPIN1 0x30000000
+#define RL_HWREV_8168B_SPIN1 0x30000000
#define RL_HWREV_8100E_SPIN1 0x30800000
#define RL_HWREV_8101E 0x34000000
#define RL_HWREV_8102E 0x34800000
-#define RL_HWREV_8103E 0x34C00000
-#define RL_HWREV_8168_SPIN2 0x38000000
-#define RL_HWREV_8168_SPIN3 0x38400000
+#define RL_HWREV_8103E 0x34C00000
+#define RL_HWREV_8168B_SPIN2 0x38000000
+#define RL_HWREV_8168B_SPIN3 0x38400000
#define RL_HWREV_8100E_SPIN2 0x38800000
#define RL_HWREV_8168C 0x3c000000
#define RL_HWREV_8168C_SPIN2 0x3c400000
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
