---

yaml --- r: 104893 b: refs/heads/master c: 7733289 h: refs/heads/master i: 104891: ef6a3d2 v: v3
git-mirror · Jul 20, 2008 · 44ac749 · 44ac749
1 parent ef5fb3a
commit 44ac749
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f887cce8de019bb32917789379af89ae4c0294ee
+refs/heads/master: 77332894c21165404496c56763d7df6c15c4bb09
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -1418,8 +1418,10 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
 
 	rtl_hw_phy_config(dev);
 
-	dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
-	RTL_W8(0x82, 0x01);
+	if (tp->mac_version <= RTL_GIGA_MAC_VER_06) {
+		dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
+		RTL_W8(0x82, 0x01);
+	}
 
 	pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);