diff options
author | yongari <yongari@FreeBSD.org> | 2011-01-18 00:46:10 +0000 |
---|---|---|
committer | yongari <yongari@FreeBSD.org> | 2011-01-18 00:46:10 +0000 |
commit | f024c25c8fd5694d92e58fcc7a4e41e744895eac (patch) | |
tree | 6f0b28db2b7b4e032a73bb58fa139fcdffe1ebf6 /sys | |
parent | 931f52388d6d2db4e5b6693768f8994576da9b67 (diff) | |
download | FreeBSD-src-f024c25c8fd5694d92e58fcc7a4e41e744895eac.zip FreeBSD-src-f024c25c8fd5694d92e58fcc7a4e41e744895eac.tar.gz |
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.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/re/if_re.c | 12 | ||||
-rw-r--r-- | sys/pci/if_rlreg.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index bdc610d..b0537f3 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -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: diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h index bcc2ab2..5a0c5e6 100644 --- a/sys/pci/if_rlreg.h +++ b/sys/pci/if_rlreg.h @@ -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 |