aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2008-06-29 07:10:54 -0400
committerFrancois Romieu <romieu@fr.zoreil.com>2008-10-10 17:09:00 -0400
commitef808d502cc3b18b2d823bbe8c03c0b8ea0df1b5 (patch)
tree4d7025a9f919e36f0aa92af0a569a70b4dca094a /drivers/net/r8169.c
parentef3386f00fcd18a40343047329ec7ed2eb98bbe8 (diff)
r8169: change default behavior for mildly identified 8168c chipsets
The addition of a new device has so far implied a specialization of these masks. While they identify 8168c devices, they can be expected to be further refined as they have been by Realtek so far. The change should bring the driver closer to the version 8.006.00 of Realtek's 8168 driver. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 775dc84336bb..4edc6b0d2b9a 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1222,14 +1222,15 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
1222 u32 val; 1222 u32 val;
1223 int mac_version; 1223 int mac_version;
1224 } mac_info[] = { 1224 } mac_info[] = {
1225 /* 8168B family. */ 1225 /* 8168C family. */
1226 { 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 }, 1226 { 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 },
1227 { 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_18 }, 1227 { 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 },
1228 { 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_23 },
1228 { 0x7cf00000, 0x3c000000, RTL_GIGA_MAC_VER_19 }, 1229 { 0x7cf00000, 0x3c000000, RTL_GIGA_MAC_VER_19 },
1229 { 0x7cf00000, 0x3c200000, RTL_GIGA_MAC_VER_20 }, 1230 { 0x7cf00000, 0x3c200000, RTL_GIGA_MAC_VER_20 },
1230 { 0x7cf00000, 0x3c300000, RTL_GIGA_MAC_VER_21 }, 1231 { 0x7cf00000, 0x3c300000, RTL_GIGA_MAC_VER_21 },
1231 { 0x7cf00000, 0x3c400000, RTL_GIGA_MAC_VER_22 }, 1232 { 0x7cf00000, 0x3c400000, RTL_GIGA_MAC_VER_22 },
1232 { 0x7c800000, 0x3c000000, RTL_GIGA_MAC_VER_20 }, 1233 { 0x7c800000, 0x3c000000, RTL_GIGA_MAC_VER_22 },
1233 1234
1234 /* 8168B family. */ 1235 /* 8168B family. */
1235 { 0x7cf00000, 0x38000000, RTL_GIGA_MAC_VER_12 }, 1236 { 0x7cf00000, 0x38000000, RTL_GIGA_MAC_VER_12 },