diff --git a/[refs] b/[refs] index 6c2a132145b4..72169a5d0ac4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d663d181b9e92d80c2455e460e932d34e7a2a7ae +refs/heads/master: 567990cfccafc580b03b1fb501adf63132c12dcc diff --git a/trunk/drivers/net/phy/bcm87xx.c b/trunk/drivers/net/phy/bcm87xx.c index f5f0562934db..9a90dcf31156 100644 --- a/trunk/drivers/net/phy/bcm87xx.c +++ b/trunk/drivers/net/phy/bcm87xx.c @@ -89,6 +89,7 @@ static int bcm87xx_config_init(struct phy_device *phydev) phydev->supported = SUPPORTED_10000baseR_FEC; phydev->advertising = ADVERTISED_10000baseR_FEC; phydev->state = PHY_NOLINK; + phydev->autoneg = AUTONEG_DISABLE; bcm87xx_of_reg_init(phydev);