ixgbe: Update flow control state machine in link setup

The flow control handling is overly complicated and difficult to maintain.
This patch cleans up the flow control handling and makes it much more
explicit.  It also adds 1G flow control autonegotiation, for 1G copper
links, 1G KX links, and 1G fiber links.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 14 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 54d96cb05b48..cec2f4e8c61e 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -224,13 +224,13 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
 
-        pause->autoneg = (hw->fc.type == ixgbe_fc_full ? 1 : 0);
+        pause->autoneg = (hw->fc.current_mode == ixgbe_fc_full ? 1 : 0);
 
-        if (hw->fc.type == ixgbe_fc_rx_pause) {
+        if (hw->fc.current_mode == ixgbe_fc_rx_pause) {
                 pause->rx_pause = 1;
-        } else if (hw->fc.type == ixgbe_fc_tx_pause) {
+        } else if (hw->fc.current_mode == ixgbe_fc_tx_pause) {
                 pause->tx_pause = 1;
-        } else if (hw->fc.type == ixgbe_fc_full) {
+        } else if (hw->fc.current_mode == ixgbe_fc_full) {
                 pause->rx_pause = 1;
                 pause->tx_pause = 1;
         }
@@ -244,22 +244,17 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,
 
         if ((pause->autoneg == AUTONEG_ENABLE) ||
             (pause->rx_pause && pause->tx_pause))
-                hw->fc.type = ixgbe_fc_full;
+                hw->fc.requested_mode = ixgbe_fc_full;
         else if (pause->rx_pause && !pause->tx_pause)
-                hw->fc.type = ixgbe_fc_rx_pause;
+                hw->fc.requested_mode = ixgbe_fc_rx_pause;
         else if (!pause->rx_pause && pause->tx_pause)
-                hw->fc.type = ixgbe_fc_tx_pause;
+                hw->fc.requested_mode = ixgbe_fc_tx_pause;
         else if (!pause->rx_pause && !pause->tx_pause)
-                hw->fc.type = ixgbe_fc_none;
+                hw->fc.requested_mode = ixgbe_fc_none;
         else
                 return -EINVAL;
 
-        hw->fc.original_type = hw->fc.type;
-
-        if (netif_running(netdev))
-                ixgbe_reinit_locked(adapter);
-        else
-                ixgbe_reset(adapter);
+        hw->mac.ops.setup_fc(hw, 0);
 
         return 0;
 }