From: Andy Gospodarek <andy@greyhouse.net>
Date: Tue, 31 Jan 2006 18:16:52 +0000 (+0100)
Subject: r8169: fix forced-mode link settings
X-Git-Tag: v2.6.16-rc3~139^2~2^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=726ecdcf688314aa8d4a4841f5f126c2cb4ecbf5;p=linux-2.6-omap-h63xx.git

r8169: fix forced-mode link settings

Allow the r8169 driver to set devices to be full-duplex only when
auto-negotiate is disabled.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a81338b501f..6e1018448ee 100644
--- a/drivers/net/r8169.c
+++ b/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;