summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-12-13 16:26:19 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-13 16:26:19 +0100
commit0ccb9aebcd98d99fdc22d938240c65c7466e8146 (patch)
treea23f3fa6f3f251eaef352079402ebbe734038d43 /net
parent2c9ebcb856b4e4ae4e7b0201e23c34b50b680957 (diff)
parenta1a50a465485dea02aa58ed861ae4594922e7c54 (diff)
downloadbarebox-0ccb9aebcd98d99fdc22d938240c65c7466e8146.tar.gz
barebox-0ccb9aebcd98d99fdc22d938240c65c7466e8146.tar.xz
Merge branch 'pu/net-link'
Diffstat (limited to 'net')
-rw-r--r--net/eth.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/eth.c b/net/eth.c
index 493ecf98db..98ec726b84 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -138,6 +138,9 @@ static int eth_carrier_check(int force)
if (!eth_current->phydev)
return 0;
+ if (force)
+ phy_wait_aneg_done(eth_current->phydev);
+
if (force || is_timeout(last_link_check, 5 * SECOND) ||
!eth_current->phydev->link) {
ret = phy_update_status(eth_current->phydev);