From ff4591a3b8d6ccda66d47031c08d39f4095d88e6 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Tue, 6 Nov 2007 22:56:10 +0100 Subject: [PATCH] --- yaml --- r: 73439 b: refs/heads/master c: 66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab h: refs/heads/master i: 73437: 08a07e6884887096225a0c149bbe445bdfb656b5 73435: ab894a38c8f7ef90b61f0e4dac899b682b64a2f3 73431: e97e395c6a4e4c0c42a815c797c9f72488f7dd79 73423: d47c73f3b45f9b9f17da57c1103c90cfe187e8a4 73407: 56ec095321a04670553efb4a9fe1f6a2558de5ab v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e69d05c84fc7..231ab0501b61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d2e28241e89227d88da53187224c84316acc86 +refs/heads/master: 66ec5d4fb1ce6f0bd9df4bc4b758f0916d9f37ab diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 702334e6b28a..9dbab3f2e59f 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -1741,7 +1741,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->features |= rtl_try_msi(pdev, ioaddr, cfg); RTL_W8(Cfg9346, Cfg9346_Lock); - if (RTL_R8(PHYstatus) & TBI_Enable) { + if ((tp->mac_version <= RTL_GIGA_MAC_VER_06) && + (RTL_R8(PHYstatus) & TBI_Enable)) { tp->set_speed = rtl8169_set_speed_tbi; tp->get_settings = rtl8169_gset_tbi; tp->phy_reset_enable = rtl8169_tbi_reset_enable;