diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82599.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 56efa98fe3b9..beae7e012609 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -404,8 +404,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw) | |||
404 | { | 404 | { |
405 | s32 status = 0; | 405 | s32 status = 0; |
406 | ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_82599_AUTONEG; | 406 | ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_82599_AUTONEG; |
407 | status = ixgbe_setup_mac_link_speed_multispeed_fiber(hw, | 407 | status = ixgbe_setup_mac_link_speed_multispeed_fiber(hw, link_speed, |
408 | link_speed, | ||
409 | true, true); | 408 | true, true); |
410 | return status; | 409 | return status; |
411 | } | 410 | } |
@@ -759,7 +758,7 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) | |||
759 | hw->mac.orig_autoc = autoc; | 758 | hw->mac.orig_autoc = autoc; |
760 | hw->mac.orig_autoc2 = autoc2; | 759 | hw->mac.orig_autoc2 = autoc2; |
761 | hw->mac.orig_link_settings_stored = true; | 760 | hw->mac.orig_link_settings_stored = true; |
762 | } else { | 761 | } else { |
763 | if (autoc != hw->mac.orig_autoc) | 762 | if (autoc != hw->mac.orig_autoc) |
764 | IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc | | 763 | IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc | |
765 | IXGBE_AUTOC_AN_RESTART)); | 764 | IXGBE_AUTOC_AN_RESTART)); |