aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/sky2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index eec36995af22..f1c0ec308bfe 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2146,7 +2146,8 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
2146 istatus, phystat); 2146 istatus, phystat);
2147 2147
2148 if (istatus & PHY_M_IS_AN_COMPL) { 2148 if (istatus & PHY_M_IS_AN_COMPL) {
2149 if (sky2_autoneg_done(sky2, phystat) == 0) 2149 if (sky2_autoneg_done(sky2, phystat) == 0 &&
2150 !netif_carrier_ok(dev))
2150 sky2_link_up(sky2); 2151 sky2_link_up(sky2);
2151 goto out; 2152 goto out;
2152 } 2153 }