netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] r8169: revert bogus BMCR reset
@ 2007-03-08 22:59 Francois Romieu
  2007-03-09 16:52 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Francois Romieu @ 2007-03-08 22:59 UTC (permalink / raw)
  To: jeff; +Cc: netdev, Roman Jarosz, Rolf Eike Beer, Edward Hsu

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 <romieu@fr.zoreil.com>
---
 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 & 0xffff);
 }
 
 static void rtl8169_check_link_status(struct net_device *dev,
-- 
1.4.4.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/2] r8169: revert bogus BMCR reset
  2007-03-08 22:59 [PATCH 1/2] r8169: revert bogus BMCR reset Francois Romieu
@ 2007-03-09 16:52 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-03-09 16:52 UTC (permalink / raw)
  To: Francois Romieu; +Cc: netdev, Roman Jarosz, Rolf Eike Beer, Edward Hsu

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 <romieu@fr.zoreil.com>
> ---
>  drivers/net/r8169.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

applied 1-2



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-03-09 16:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-08 22:59 [PATCH 1/2] r8169: revert bogus BMCR reset Francois Romieu
2007-03-09 16:52 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).