aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorfrançois romieu <romieu@fr.zoreil.com>2009-08-10 15:42:37 -0400
committerDavid S. Miller <davem@davemloft.net>2009-08-13 01:13:20 -0400
commit21d57363201857bd8c5c0ad0ebc795134d632195 (patch)
treef496d0c298a8f13f0e510c883af9d6fa82b2a2a0 /drivers
parent5edcc537af1a9810726d1b68ba6c59e5d8d36113 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/r8169.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index eac882b18db0..6c4b879497d8 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)
2180 pci_set_drvdata(pdev, dev); 2180 pci_set_drvdata(pdev, dev);
2181 2181
2182 if (netif_msg_probe(tp)) { 2182 if (netif_msg_probe(tp)) {
2183 u32 xid = RTL_R32(TxConfig) & 0x7cf0f8ff; 2183 u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff;
2184 2184
2185 printk(KERN_INFO "%s: %s at 0x%lx, " 2185 printk(KERN_INFO "%s: %s at 0x%lx, "
2186 "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, " 2186 "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "