diff options
author | Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> | 2009-06-30 07:44:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-30 22:46:53 -0400 |
commit | a1f25324b93ecdab1cbb27d3e9c4cafecb06ceda (patch) | |
tree | 14984588ef839346a94438f607bef32ab6f23213 /drivers/net/ixgbe/ixgbe_main.c | |
parent | a380137900fca5c79e6daa9500bdb6ea5649188e (diff) |
ixgbe: Fix link capabilities during adapter resets
Adapter link advertisement capabilities were not persistent during
adapter resets. While configuring multispeed fiber link check for
phy autoneg_advertised settings before overwriting with default
link capabilities
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 30d8c0e41a9d..fce2ef49b3a7 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -4506,7 +4506,8 @@ static void ixgbe_multispeed_fiber_task(struct work_struct *work) | |||
4506 | u32 autoneg; | 4506 | u32 autoneg; |
4507 | 4507 | ||
4508 | adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK; | 4508 | adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK; |
4509 | if (hw->mac.ops.get_link_capabilities) | 4509 | autoneg = hw->phy.autoneg_advertised; |
4510 | if ((!autoneg) && (hw->mac.ops.get_link_capabilities)) | ||
4510 | hw->mac.ops.get_link_capabilities(hw, &autoneg, | 4511 | hw->mac.ops.get_link_capabilities(hw, &autoneg, |
4511 | &hw->mac.autoneg); | 4512 | &hw->mac.autoneg); |
4512 | if (hw->mac.ops.setup_link_speed) | 4513 | if (hw->mac.ops.setup_link_speed) |