2010-05-16 12:36:26 +00:00
|
|
|
--- a/drivers/net/r6040.c
|
|
|
|
|
+++ b/drivers/net/r6040.c
|
2010-05-24 20:35:46 +00:00
|
|
|
@@ -401,9 +401,6 @@ static void r6040_init_mac_regs(struct n
|
2010-05-16 12:36:26 +00:00
|
|
|
* 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)
|
2010-05-24 20:35:46 +00:00
|
|
|
@@ -531,8 +528,6 @@ static int r6040_phy_mode_chk(struct net
|
2010-05-16 12:36:26 +00:00
|
|
|
phy_dat = 0x0000;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- mii_check_media(&lp->mii_if, 0, 1);
|
|
|
|
|
-
|
|
|
|
|
return phy_dat;
|
|
|
|
|
};
|
|
|
|
|
|
2010-05-24 20:35:46 +00:00
|
|
|
@@ -814,6 +809,9 @@ static void r6040_timer(unsigned long da
|
2010-05-16 12:36:26 +00:00
|
|
|
|
|
|
|
|
/* 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 */
|
