39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From sgruszka@redhat.com Fri Nov 26 08:03:41 2010
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
To: kernel@lists.fedoraproject.org, Kyle McMartin <kmcmartin@redhat.com>
|
|
Subject: [PATCH 2.6.34 1/4] r8169: incorrect identifier for a 8168dp
|
|
Date: Fri, 26 Nov 2010 14:03:33 +0100
|
|
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
|
|
Merge error.
|
|
|
|
commit 17c99297212a2d1b1779a08caf4b0d83a85545df upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/net/r8169.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 17382c3..289165e 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -1300,7 +1300,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 },
|
|
--
|
|
1.7.3.2
|
|
|