ixgbe: Fix 82599 adapter link flickering issues

Fix autoneg restart issues in flow control path which might create
endless link flickering due to known timing issues with 82599
adapters.

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakakla@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 84b83f7b473f..4d83e5916593 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -413,9 +413,6 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw)
                 }
         }
 
-        /* Set up flow control */
-        status = ixgbe_setup_fc_generic(hw, 0);
-
         /* Add delay to filter out noises during initial link setup */
         msleep(50);
 
@@ -641,6 +638,11 @@ s32 ixgbe_check_mac_link_82599(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
         else
                 *speed = IXGBE_LINK_SPEED_100_FULL;
 
+        /* if link is down, zero out the current_mode */
+        if (*link_up == false) {
+                hw->fc.current_mode = ixgbe_fc_none;
+                hw->fc.fc_was_autonegged = false;
+        }
 
         return 0;
 }
@@ -747,9 +749,6 @@ s32 ixgbe_setup_mac_link_speed_82599(struct ixgbe_hw *hw,
                         }
                 }
 
-                /* Set up flow control */
-                status = ixgbe_setup_fc_generic(hw, 0);
-
                 /* Add delay to filter out noises during initial link setup */
                 msleep(50);
         }
@@ -1509,7 +1508,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
         .disable_mc             = &ixgbe_disable_mc_generic,
         .clear_vfta             = &ixgbe_clear_vfta_82599,
         .set_vfta               = &ixgbe_set_vfta_82599,
-        .setup_fc               = &ixgbe_setup_fc_generic,
+        .fc_enable               = &ixgbe_fc_enable_generic,
         .init_uta_tables        = &ixgbe_init_uta_tables_82599,
         .setup_sfp              = &ixgbe_setup_sfp_modules_82599,
 };