| 1 | --- a/drivers/net/r6040.c |
| 2 | +++ b/drivers/net/r6040.c |
| 3 | @@ -401,9 +401,6 @@ static void r6040_init_mac_regs(struct n |
| 4 | * we may got called by r6040_tx_timeout which has left |
| 5 | * some unsent tx buffers */ |
| 6 | iowrite16(0x01, ioaddr + MTPR); |
| 7 | - |
| 8 | - /* Check media */ |
| 9 | - mii_check_media(&lp->mii_if, 1, 1); |
| 10 | } |
| 11 | |
| 12 | static void r6040_tx_timeout(struct net_device *dev) |
| 13 | @@ -531,8 +528,6 @@ static int r6040_phy_mode_chk(struct net |
| 14 | phy_dat = 0x0000; |
| 15 | } |
| 16 | |
| 17 | - mii_check_media(&lp->mii_if, 0, 1); |
| 18 | - |
| 19 | return phy_dat; |
| 20 | }; |
| 21 | |
| 22 | @@ -814,6 +809,9 @@ static void r6040_timer(unsigned long da |
| 23 | |
| 24 | /* Timer active again */ |
| 25 | mod_timer(&lp->timer, round_jiffies(jiffies + HZ)); |
| 26 | + |
| 27 | + /* Check media */ |
| 28 | + mii_check_media(&lp->mii_if, 1, 1); |
| 29 | } |
| 30 | |
| 31 | /* Read/set MAC address routines */ |
| 32 | |
