diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-05-27 01:38:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-28 00:46:53 +0200 |
| commit | 824fb38e99cd5334629b340a2ae1ba0917cc35ab (patch) | |
| tree | d2b963179fc4839cf1cc2740ff294452bf3fabce /drivers/net/r6040.c | |
| parent | tcp: Do not check flush when comparing options for GRO (diff) | |
| download | linux-824fb38e99cd5334629b340a2ae1ba0917cc35ab.tar.xz linux-824fb38e99cd5334629b340a2ae1ba0917cc35ab.zip | |
r6040: check and update media status
This patch removes the not-that-useful message in the
r6040_timer which prints the PHY status. Instead
replace it with a call to mii_check_media which will
update the link status and print it on startup.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/r6040.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 1508b124e3d8..ed63d23a6452 100644 --- a/drivers/net/r6040.c +++ b/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 */ |