[patch] patch-from-maintainer-to-fix-problem

verkkokortti.patch (text/plain), 987 bytes, created by Eero Volotinen on 2007-03-07 12:39:44 UTC

From 163c2283d3f493e4897f5866e40fb08eaf3b92ca Mon Sep 17 00:00:00 2001
From: Francois Romieu <[e-mail]>
Date: Tue, 6 Mar 2007 23:09:56 +0100
Subject: [PATCH] r8169: revert bogus BMCR reset

The current code requests a reset but prohibits autoneg, 1000 Mb/s,
100 Mb/s and full duplex. I wonder why it does not cause more
regression.

Signed-off-by: Francois Romieu <[e-mail]>
---
 drivers/net/r8169.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 13cf06e..cca9233 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -572,8 +572,8 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr)
 {
 	unsigned int val;
 
-	mdio_write(ioaddr, MII_BMCR, BMCR_RESET);
-	val = mdio_read(ioaddr, MII_BMCR);
+	val = mdio_read(ioaddr, MII_BMCR) | BMCR_RESET;
+	mdio_write(ioaddr, MII_BMCR, val & 0xffff);
 }
 
 static void rtl8169_check_link_status(struct net_device *dev,
-- 
1.4.4.4