From 1df12be69c9b9a3fe7034e285c1ce5b42bcadc80 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 26 May 2009 23:38:10 +0000
Subject: [PATCH] --- yaml --- r: 150527 b: refs/heads/master c:
 824fb38e99cd5334629b340a2ae1ba0917cc35ab h: refs/heads/master i:   150525:
 bcf12285cec63d0db90c77097ddf6648f908bb09   150523:
 9a299aa73e72f7975a8cf50646827efab6e61833   150519:
 f04679a1f4743c7aeaee8cd7933644c89186ade7   150511:
 e65471952a9135420e774ee1a2f9d9e54294638e   150495:
 ced861d5da8bf6a6f0242732c6c60892ca90d919   150463:
 695dc2c7dbd405f12be0feecd8b27eba2706a22d   150399:
 18e263d76f50c650b5ec5b3c8cb1233f6a730a4e   150271:
 ea7db28a165cf5b4627334998c181692245d25c9   150015:
 0aeba74286e2c71e4b0d2331d0292bccc0a1d7e4   149503:
 95bf031cb42393790ffe115e7975452420b84169 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index deec6c003033..d5dcc72b3884 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2a804cddfe65f18f903985e8a8d04c7c9eec354
+refs/heads/master: 824fb38e99cd5334629b340a2ae1ba0917cc35ab
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 1508b124e3d8..ed63d23a6452 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -401,6 +401,9 @@ static void r6040_init_mac_regs(struct net_device *dev)
 	 * we may got called by r6040_tx_timeout which has left
 	 * some unsent tx buffers */
 	iowrite16(0x01, ioaddr + MTPR);
+
+	/* Check media */
+	mii_check_media(&lp->mii_if, 1, 1);
 }
 
 static void r6040_tx_timeout(struct net_device *dev)
@@ -528,6 +531,8 @@ static int r6040_phy_mode_chk(struct net_device *dev)
 			phy_dat = 0x0000;
 	}
 
+	mii_check_media(&lp->mii_if, 0, 1);
+
 	return phy_dat;
 };
 
@@ -810,7 +815,6 @@ static void r6040_timer(unsigned long data)
 		lp->phy_mode = phy_mode;
 		lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode;
 		iowrite16(lp->mcr0, ioaddr);
-		printk(KERN_INFO "Link Change %x \n", ioread16(ioaddr));
 	}
 
 	/* Timer active again */