---

yaml --- r: 19874 b: refs/heads/master c: 726ecdc h: refs/heads/master v: v3
git-mirror · Jan 31, 2006 · 3714b8e · 3714b8e
1 parent c1a9f2f
commit 3714b8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2371408c021f961b92fd2c42480cfddc9c6254f0
+refs/heads/master: 726ecdcf688314aa8d4a4841f5f126c2cb4ecbf5
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -675,6 +675,9 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
 
 		if (duplex == DUPLEX_HALF)
 			auto_nego &= ~(PHY_Cap_10_Full | PHY_Cap_100_Full);
+
+		if (duplex == DUPLEX_FULL)
+			auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_100_Half);
 	}
 
 	tp->phy_auto_nego_reg = auto_nego;