---

yaml --- r: 73439 b: refs/heads/master c: 66ec5d4 h: refs/heads/master i: 73437: 08a07e6 73435: ab894a3 73431: e97e395 73423: d47c73f 73407: 56ec095 v: v3
git-mirror · Nov 10, 2007 · ff4591a · ff4591a
1 parent 96aa6c1
commit ff4591a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;