diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2007-06-11 17:35:18 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-08 22:16:43 -0400 |
commit | ba6eb6ee8583a2c7c7f8327be5e5c239fb760b03 (patch) | |
tree | 6f4e185f35922e168aa1539efd760beeb7ff04a5 | |
parent | cdf1a608a6ccf9cf1a773969395b58b017bd6f75 (diff) |
r8169: prettify mac_version
...still a bit yucky though.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
-rw-r--r-- | drivers/net/r8169.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 56b9040b3d55..eb793fa4611c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -151,11 +151,11 @@ static const int multicast_filter_limit = 32; | |||
151 | #define RTL_R32(reg) ((unsigned long) readl (ioaddr + (reg))) | 151 | #define RTL_R32(reg) ((unsigned long) readl (ioaddr + (reg))) |
152 | 152 | ||
153 | enum mac_version { | 153 | enum mac_version { |
154 | RTL_GIGA_MAC_VER_01 = 0x00, | 154 | RTL_GIGA_MAC_VER_01 = 0x01, // 8169 |
155 | RTL_GIGA_MAC_VER_02 = 0x01, | 155 | RTL_GIGA_MAC_VER_02 = 0x02, // 8169S |
156 | RTL_GIGA_MAC_VER_03 = 0x02, | 156 | RTL_GIGA_MAC_VER_03 = 0x03, // 8110S |
157 | RTL_GIGA_MAC_VER_04 = 0x03, | 157 | RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB |
158 | RTL_GIGA_MAC_VER_05 = 0x04, | 158 | RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd |
159 | RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb | 159 | RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb |
160 | RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be 8168Bf | 160 | RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be 8168Bf |
161 | RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb 8101Ec | 161 | RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb 8101Ec |
@@ -180,11 +180,11 @@ static const struct { | |||
180 | u8 mac_version; | 180 | u8 mac_version; |
181 | u32 RxConfigMask; /* Clears the bits supported by this chip */ | 181 | u32 RxConfigMask; /* Clears the bits supported by this chip */ |
182 | } rtl_chip_info[] = { | 182 | } rtl_chip_info[] = { |
183 | _R("RTL8169", RTL_GIGA_MAC_VER_01, 0xff7e1880), | 183 | _R("RTL8169", RTL_GIGA_MAC_VER_01, 0xff7e1880), // 8169 |
184 | _R("RTL8169s/8110s", RTL_GIGA_MAC_VER_02, 0xff7e1880), | 184 | _R("RTL8169s", RTL_GIGA_MAC_VER_02, 0xff7e1880), // 8169S |
185 | _R("RTL8169s/8110s", RTL_GIGA_MAC_VER_03, 0xff7e1880), | 185 | _R("RTL8110s", RTL_GIGA_MAC_VER_03, 0xff7e1880), // 8110S |
186 | _R("RTL8169sb/8110sb", RTL_GIGA_MAC_VER_04, 0xff7e1880), | 186 | _R("RTL8169sb/8110sb", RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB |
187 | _R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_05, 0xff7e1880), | 187 | _R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd |
188 | _R("RTL8168b/8111b", RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E | 188 | _R("RTL8168b/8111b", RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E |
189 | _R("RTL8168b/8111b", RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E | 189 | _R("RTL8168b/8111b", RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E |
190 | _R("RTL8101e", RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139 | 190 | _R("RTL8101e", RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139 |