]> git.hungrycats.org Git - linux/commitdiff
r8169: incorrect identifier for a 8168dp
authorFrancois Romieu <romieu@fr.zoreil.com>
Mon, 12 Jul 2010 00:10:09 +0000 (17:10 -0700)
committerWilly Tarreau <w@1wt.eu>
Mon, 10 Jun 2013 09:42:55 +0000 (11:42 +0200)
Merge error.

See CFG_METHOD_8 (0x3c800000 + 0x00300000) since version 8.002.00
of Realtek's driver.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 17c99297212a2d1b1779a08caf4b0d83a85545df)
Cc: Thomas Bork <tom@eisfair.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/net/r8169.c

index 2d8906255bb3a7c76c973d88e283ff59c8bccc4a..7ddbb8e12d57b1b39487e2184f5b79c9e4f3a2fa 100644 (file)
@@ -1307,7 +1307,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                { 0x7c800000, 0x28000000,       RTL_GIGA_MAC_VER_26 },
 
                /* 8168C family. */
-               { 0x7cf00000, 0x3ca00000,       RTL_GIGA_MAC_VER_24 },
+               { 0x7cf00000, 0x3cb00000,       RTL_GIGA_MAC_VER_24 },
                { 0x7cf00000, 0x3c900000,       RTL_GIGA_MAC_VER_23 },
                { 0x7cf00000, 0x3c800000,       RTL_GIGA_MAC_VER_18 },
                { 0x7c800000, 0x3c800000,       RTL_GIGA_MAC_VER_24 },