Commit b43bd728 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "phy: micrel: Disable auto negotiation on startup" 



This reverts commit 99f81afc.

It was papering over the real problem, which is fixed by commit
f555f34f ("net: phy: fix auto-negotiation stall due to unavailable
interrupt")

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f555f34f

drivers/net/phy/micrel.c

+0 −11
Original line number Diff line number Diff line
@@ -297,17 +297,6 @@ static int kszphy_config_init(struct phy_device *phydev) 
	if (priv->led_mode >= 0)

		kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode);



	if (phy_interrupt_is_valid(phydev)) {

		int ctl = phy_read(phydev, MII_BMCR);



		if (ctl < 0)

			return ctl;



		ret = phy_write(phydev, MII_BMCR, ctl & ~BMCR_ANENABLE);

		if (ret < 0)

			return ret;

	}



	return 0;

}