From: françois romieu <romieu@fr.zoreil.com>
Date: Mon, 10 Aug 2009 19:42:37 +0000 (+0000)
Subject: r8169: differentiate close chipsets in the startup identification message
X-Git-Tag: v2.6.32-rc1~703^2~422
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=21d57363201857bd8c5c0ad0ebc795134d632195;p=~shefty%2Frdma-dev.git

r8169: differentiate close chipsets in the startup identification message

The driver displays the same 0x18000000 xid for RTL_GIGA_MAC_VER_06
and RTL_GIGA_MAC_VER_05 whereas the former ought to be identified as
0x98000000.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index eac882b18db..6c4b879497d 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2180,7 +2180,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	pci_set_drvdata(pdev, dev);
 
 	if (netif_msg_probe(tp)) {
-		u32 xid = RTL_R32(TxConfig) & 0x7cf0f8ff;
+		u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff;
 
 		printk(KERN_INFO "%s: %s at 0x%lx, "
 		       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "