From ad4605a3777f6f47103d9ea62d01615512f819cb Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Sun, 29 Jun 2008 13:10:54 +0200 Subject: [PATCH] --- yaml --- r: 112263 b: refs/heads/master c: ef808d502cc3b18b2d823bbe8c03c0b8ea0df1b5 h: refs/heads/master i: 112261: 9797483da8d2ffb5e3a46ccf98e11f2682bfe46f 112259: 8a7f00c872fc6a0e2dd18b111439d31b9180e37a 112255: 1ae6b84f1fc81b304853bcc052dddd42e87f4486 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c842e28b0720..679a0cc65bb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef3386f00fcd18a40343047329ec7ed2eb98bbe8 +refs/heads/master: ef808d502cc3b18b2d823bbe8c03c0b8ea0df1b5 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 775dc84336bb..4edc6b0d2b9a 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -1222,14 +1222,15 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, u32 val; int mac_version; } mac_info[] = { - /* 8168B family. */ + /* 8168C family. */ { 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 }, - { 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_18 }, + { 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 }, + { 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_23 }, { 0x7cf00000, 0x3c000000, RTL_GIGA_MAC_VER_19 }, { 0x7cf00000, 0x3c200000, RTL_GIGA_MAC_VER_20 }, { 0x7cf00000, 0x3c300000, RTL_GIGA_MAC_VER_21 }, { 0x7cf00000, 0x3c400000, RTL_GIGA_MAC_VER_22 }, - { 0x7c800000, 0x3c000000, RTL_GIGA_MAC_VER_20 }, + { 0x7c800000, 0x3c000000, RTL_GIGA_MAC_VER_22 }, /* 8168B family. */ { 0x7cf00000, 0x38000000, RTL_GIGA_MAC_VER_12 },