---

yaml --- r: 154699 b: refs/heads/master c: a1f2532 h: refs/heads/master i: 154697: a4402e7 154695: aa15da0 v: v3
git-mirror · Jul 1, 2009 · d1f46da · d1f46da
1 parent 3477e03
commit d1f46da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a380137900fca5c79e6daa9500bdb6ea5649188e
+refs/heads/master: a1f25324b93ecdab1cbb27d3e9c4cafecb06ceda
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -4506,7 +4506,8 @@ static void ixgbe_multispeed_fiber_task(struct work_struct *work)
 	u32 autoneg;
 
 	adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK;
-	if (hw->mac.ops.get_link_capabilities)
+	autoneg = hw->phy.autoneg_advertised;
+	if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
 		hw->mac.ops.get_link_capabilities(hw, &autoneg,
 		                                  &hw->mac.autoneg);
 	if (hw->mac.ops.setup_link_speed)