sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'pu/net-link'

This commit is contained in:
Sascha Hauer 2012-12-13 16:26:19 +01:00
parent 2c9ebcb856 a1a50a4654
commit 0ccb9aebcd
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/phy/phy.c
View File

@ -401,11 +401,14 @@ int genphy_setup_forced(struct phy_device *phydev)
return err;
}
static int phy_aneg_done(struct phy_device *phydev)
int phy_wait_aneg_done(struct phy_device *phydev)
{
uint64_t start = get_time_ns();
int ctl;
if (phydev->autoneg == AUTONEG_DISABLE)
return 0;
while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)) {
ctl = phy_read(phydev, MII_BMSR);
if (ctl & BMSR_ANEGCOMPLETE) {
@ -452,7 +455,7 @@ int genphy_restart_aneg(struct phy_device *phydev)
if (ctl < 0)
return ctl;
return phy_aneg_done(phydev);
return 0;
}
/**

1
include/linux/phy.h
View File

@ -267,6 +267,7 @@ int phy_device_connect(struct eth_device *dev, struct mii_bus *bus, int addr,
u32 flags, phy_interface_t interface);
int phy_update_status(struct phy_device *phydev);
int phy_wait_aneg_done(struct phy_device *phydev);
/* Generic PHY support and helper functions */
int genphy_restart_aneg(struct phy_device *phydev);

3
net/eth.c
View File

@ -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);