svn commit: r217524 - in head/sys: dev/re pci

Pyun YongHyeon yongari at FreeBSD.org
Tue Jan 18 00:46:11 UTC 2011


Author: yongari
Date: Tue Jan 18 00:46:10 2011
New Revision: 217524
URL: http://svn.freebsd.org/changeset/base/217524

Log:
  Change model names of controller RTL_HWREV_8168_SPIN[123] to real ones.
  s/RL_HWREV_8168_SPIN1/RL_HWREV_8168B_SPIN1/g
  s/RL_HWREV_8168_SPIN2/RL_HWREV_8168B_SPIN2/g
  s/RL_HWREV_8168_SPIN3/RL_HWREV_8168B_SPIN3/g
  No functional changes.

Modified:
  head/sys/dev/re/if_re.c
  head/sys/pci/if_rlreg.h

Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c	Mon Jan 17 23:54:50 2011	(r217523)
+++ head/sys/dev/re/if_re.c	Tue Jan 18 00:46:10 2011	(r217524)
@@ -197,7 +197,7 @@ static struct rl_hwrev re_hwrevs[] = {
 	{ RL_HWREV_8139C, RL_8139, "C", RL_MTU },
 	{ RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C", RL_MTU },
 	{ RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+", RL_MTU },
-	{ RL_HWREV_8168_SPIN1, RL_8169, "8168", RL_JUMBO_MTU },
+	{ RL_HWREV_8168B_SPIN1, RL_8169, "8168", RL_JUMBO_MTU },
 	{ RL_HWREV_8169, RL_8169, "8169", RL_JUMBO_MTU },
 	{ RL_HWREV_8169S, RL_8169, "8169S", RL_JUMBO_MTU },
 	{ RL_HWREV_8110S, RL_8169, "8110S", RL_JUMBO_MTU },
@@ -213,8 +213,8 @@ static struct rl_hwrev re_hwrevs[] = {
 	{ RL_HWREV_8102EL, RL_8169, "8102EL", RL_MTU },
 	{ RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU },
 	{ RL_HWREV_8103E, RL_8169, "8103E", RL_MTU },
-	{ RL_HWREV_8168_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
-	{ RL_HWREV_8168_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
+	{ RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
+	{ RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
 	{ RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
 	{ RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
 	{ RL_HWREV_8168CP, RL_8169, "8168CP/8111CP", RL_JUMBO_MTU_6K },
@@ -1334,11 +1334,11 @@ re_attach(device_t dev)
 		    RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP |
 		    RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP;
 		break;
-	case RL_HWREV_8168_SPIN1:
-	case RL_HWREV_8168_SPIN2:
+	case RL_HWREV_8168B_SPIN1:
+	case RL_HWREV_8168B_SPIN2:
 		sc->rl_flags |= RL_FLAG_WOLRXENB;
 		/* FALLTHROUGH */
-	case RL_HWREV_8168_SPIN3:
+	case RL_HWREV_8168B_SPIN3:
 		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_MACSTAT;
 		break;
 	case RL_HWREV_8168C_SPIN2:

Modified: head/sys/pci/if_rlreg.h
==============================================================================
--- head/sys/pci/if_rlreg.h	Mon Jan 17 23:54:50 2011	(r217523)
+++ head/sys/pci/if_rlreg.h	Tue Jan 18 00:46:10 2011	(r217524)
@@ -166,13 +166,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		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_8168B_SPIN2	0x38000000
+#define	RL_HWREV_8168B_SPIN3	0x38400000
 #define	RL_HWREV_8168C		0x3C000000
 #define	RL_HWREV_8168C_SPIN2	0x3C400000
 #define	RL_HWREV_8168CP		0x3C800000


More information about the svn-src-head mailing list