Commit 9badba25 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sky2: avoid duplicate link up on Optima chip 



The Optima version has feature to detect link quickly without PHY interrupt,
but it causes duplicate link up events.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b7c47aa

drivers/net/sky2.c

+2 −1
Original line number Diff line number Diff line
@@ -2146,7 +2146,8 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) 
		   istatus, phystat);



	if (istatus & PHY_M_IS_AN_COMPL) {

		if (sky2_autoneg_done(sky2, phystat) == 0)

		if (sky2_autoneg_done(sky2, phystat) == 0 &&

		    !netif_carrier_ok(dev))

			sky2_link_up(sky2);

		goto out;

	}