From 3714b8e2566285c10b99c186a41a78752cf3eb4c Mon Sep 17 00:00:00 2001
From: Andy Gospodarek <andy@greyhouse.net>
Date: Tue, 31 Jan 2006 19:16:52 +0100
Subject: [PATCH] --- yaml --- r: 19874 b: refs/heads/master c:
 726ecdcf688314aa8d4a4841f5f126c2cb4ecbf5 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ffe650426a1b..a42c9149d6f8 100644
--- 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
index a81338b501fb..6e1018448eea 100644
--- 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;