netdev
[Top] [All Lists]

[PATCH 2.6.9-rc1-mm4 4/4] r8169: Mac identifier extracted from Realtek's

To: Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: [PATCH 2.6.9-rc1-mm4 4/4] r8169: Mac identifier extracted from Realtek's driver v2.2
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
Date: Fri, 10 Sep 2004 00:52:47 +0200
Cc: akpm@xxxxxxxx, netdev@xxxxxxxxxxx
In-reply-to: <20040909224947.GB10144@electric-eye.fr.zoreil.com>
References: <20040909224539.GA9629@electric-eye.fr.zoreil.com> <20040909224817.GA10144@electric-eye.fr.zoreil.com> <20040909224947.GB10144@electric-eye.fr.zoreil.com>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
Mac identifier extracted from Realtek's driver v2.2.

Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>

diff -puN drivers/net/r8169.c~r8169-170 drivers/net/r8169.c
--- linux-2.6.9-rc1/drivers/net/r8169.c~r8169-170       2004-09-08 
22:55:42.000000000 +0200
+++ linux-2.6.9-rc1-fr/drivers/net/r8169.c      2004-09-08 23:31:09.000000000 
+0200
@@ -136,7 +136,8 @@ enum mac_version {
        RTL_GIGA_MAC_VER_B = 0x00,
        /* RTL_GIGA_MAC_VER_C = 0x03, */
        RTL_GIGA_MAC_VER_D = 0x01,
-       RTL_GIGA_MAC_VER_E = 0x02
+       RTL_GIGA_MAC_VER_E = 0x02,
+       RTL_GIGA_MAC_VER_X = 0x04       /* Greater than RTL_GIGA_MAC_VER_E */
 };
 
 enum phy_version {
@@ -869,6 +870,7 @@ static void rtl8169_get_mac_version(stru
                u32 mask;
                int mac_version;
        } mac_info[] = {
+               { 0x1 << 28,    RTL_GIGA_MAC_VER_X },
                { 0x1 << 26,    RTL_GIGA_MAC_VER_E },
                { 0x1 << 23,    RTL_GIGA_MAC_VER_D }, 
                { 0x00000000,   RTL_GIGA_MAC_VER_B } /* Catch-all */

_

<Prev in Thread] Current Thread [Next in Thread>