From 90acd664e63be4d8330385cec5f38acc93037f68 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 16 May 2010 02:30:56 +0000
Subject: [PATCH] --- yaml --- r: 195176 b: refs/heads/master c:
 ce26b4d1d52c9a881a99fd316c32e58cdf2d586e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8a6fca0eda9..a353ce88d617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b14ed884df5968b0977114ebd5a22f58d0d15315
+refs/heads/master: ce26b4d1d52c9a881a99fd316c32e58cdf2d586e
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 3cc7befa3eb1..9a251acf5ab8 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -400,9 +400,6 @@ 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)
@@ -530,8 +527,6 @@ static int r6040_phy_mode_chk(struct net_device *dev)
 			phy_dat = 0x0000;
 	}
 
-	mii_check_media(&lp->mii_if, 0, 1);
-
 	return phy_dat;
 };
 
@@ -813,6 +808,9 @@ static void r6040_timer(unsigned long data)
 
 	/* Timer active again */
 	mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
+
+	/* Check media */
+	mii_check_media(&lp->mii_if, 1, 1);
 }
 
 /* Read/set MAC address routines */