From d1f46da75393fbfbbb78f64fa495c9de790cde58 Mon Sep 17 00:00:00 2001 From: Mallikarjuna R Chilakala Date: Tue, 30 Jun 2009 11:44:36 +0000 Subject: [PATCH] --- yaml --- r: 154699 b: refs/heads/master c: a1f25324b93ecdab1cbb27d3e9c4cafecb06ceda h: refs/heads/master i: 154697: a4402e76811987a01a60672adb9d7594edf170ca 154695: aa15da0b7925a5b0ddbea59eb4f3d10bf0fa08ef v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ac8e60ae4b93..2c00ca529ca2 100644 --- 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 index 30d8c0e41a9d..fce2ef49b3a7 100644 --- 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)