Re: [PATCH 1/2] r8169: revert bogus BMCR reset

2007-03-09 Thread Jeff Garzik 

Francois Romieu wrote:

Added during bf793295e1090af84972750898bf8470df5e5419

The current code requests a reset but prohibits autoneg, 1000 Mb/s,
100 Mb/s and full duplex. The 8168 does not like it at all.

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


applied 1-2


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] r8169: revert bogus BMCR reset

2007-03-08 Thread Francois Romieu 
Added during bf793295e1090af84972750898bf8470df5e5419

The current code requests a reset but prohibits autoneg, 1000 Mb/s,
100 Mb/s and full duplex. The 8168 does not like it at all.

Signed-off-by: Francois Romieu <[EMAIL PROTECTED]>
---
 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 688b64d..521b5f0 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 & 0x);
 }
 
 static void rtl8169_check_link_status(struct net_device *dev,
-- 
1.4.4.4

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html