1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index ed265a7a898f..de4db0dc7879 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -411,7 +411,8 @@ static s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
 
         /* Decide whether to use autoneg or not. */
         hw->mac.ops.check_link(hw, &speed, &link_up, false);
-        if (hw->phy.multispeed_fiber && (speed == IXGBE_LINK_SPEED_1GB_FULL))
+        if (!hw->fc.disable_fc_autoneg && hw->phy.multispeed_fiber &&
+            (speed == IXGBE_LINK_SPEED_1GB_FULL))
                 ret_val = ixgbe_fc_autoneg(hw);
 
         if (ret_val)