---

yaml --- r: 150527 b: refs/heads/master c: 824fb38 h: refs/heads/master i: 150525: bcf1228 150523: 9a299aa 150519: f04679a 150511: e654719 150495: ced861d 150463: 695dc2c 150399: 18e263d 150271: ea7db28 150015: 0aeba74 149503: 95bf031 v: v3
git-mirror · May 27, 2009 · 1df12be · 1df12be
1 parent 2aad43e
commit 1df12be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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 */