ixgbe: disable flow control by default

Since the adapter cannot tell what the remote end's flow control capability
is through auto-neg, we must turn off flow control by default.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index b5a9b9da2fb7..cba7a38bf6bb 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2446,8 +2446,12 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
         adapter->tx_eitr = 1;
 
         /* default flow control settings */
-        hw->fc.original_type = ixgbe_fc_full;
-        hw->fc.type = ixgbe_fc_full;
+        hw->fc.original_type = ixgbe_fc_none;
+        hw->fc.type = ixgbe_fc_none;
+        hw->fc.high_water = IXGBE_DEFAULT_FCRTH;
+        hw->fc.low_water = IXGBE_DEFAULT_FCRTL;
+        hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
+        hw->fc.send_xon = true;
 
         /* select 10G link by default */
         hw->mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN;
@@ -3587,13 +3591,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         INIT_WORK(&adapter->reset_task, ixgbe_reset_task);
 
-        /* initialize default flow control settings */
-        hw->fc.original_type = ixgbe_fc_full;
-        hw->fc.type = ixgbe_fc_full;
-        hw->fc.high_water = IXGBE_DEFAULT_FCRTH;
-        hw->fc.low_water = IXGBE_DEFAULT_FCRTL;
-        hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
-
         err = ixgbe_init_interrupt_scheme(adapter);
         if (err)
                 goto err_sw_init;