Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9e0db8ef4a8c8fd6f3a506259975d7f8db962421
Commit:     9e0db8ef4a8c8fd6f3a506259975d7f8db962421
Parent:     874183072de73a36a958585e3186639fd2634701
Author:     Francois Romieu <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 8 23:59:54 2007 +0100
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 11:51:32 2007 -0500

    r8169: revert bogus BMCR reset
    
    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]>
    Signed-off-by: Jeff Garzik <[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 15d954e..6693a30 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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to