igb: SerDes flow control setting

This path allows users to get appropriate flow control setting on SerDes
devices, based on original implementation for Copper devices.
Also, since 100baseFX does not support setting flow control, so exclude
it from the setting mechanism.

Signed-off-by: Akeem G. Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 4e54f847ac9218fbba1cd56c809861baec5fcee4..7b25ee2e81c09042b1cc540020f62f1f72f8081b 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -164,21 +164,6 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                        ecmd->advertising |= hw->phy.autoneg_advertised;
                }
 
-               if (hw->mac.autoneg != 1)
-                       ecmd->advertising &= ~(ADVERTISED_Pause |
-                                              ADVERTISED_Asym_Pause);
-
-               if (hw->fc.requested_mode == e1000_fc_full)
-                       ecmd->advertising |= ADVERTISED_Pause;
-               else if (hw->fc.requested_mode == e1000_fc_rx_pause)
-                       ecmd->advertising |= (ADVERTISED_Pause |
-                                             ADVERTISED_Asym_Pause);
-               else if (hw->fc.requested_mode == e1000_fc_tx_pause)
-                       ecmd->advertising |=  ADVERTISED_Asym_Pause;
-               else
-                       ecmd->advertising &= ~(ADVERTISED_Pause |
-                                              ADVERTISED_Asym_Pause);
-
                ecmd->port = PORT_TP;
                ecmd->phy_address = hw->phy.addr;
                ecmd->transceiver = XCVR_INTERNAL;
@@ -206,6 +191,21 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                ecmd->transceiver = XCVR_EXTERNAL;
        }
 
+       if (hw->mac.autoneg != 1)
+               ecmd->advertising &= ~(ADVERTISED_Pause |
+                                      ADVERTISED_Asym_Pause);
+
+       if (hw->fc.requested_mode == e1000_fc_full)
+               ecmd->advertising |= ADVERTISED_Pause;
+       else if (hw->fc.requested_mode == e1000_fc_rx_pause)
+               ecmd->advertising |= (ADVERTISED_Pause |
+                                     ADVERTISED_Asym_Pause);
+       else if (hw->fc.requested_mode == e1000_fc_tx_pause)
+               ecmd->advertising |=  ADVERTISED_Asym_Pause;
+       else
+               ecmd->advertising &= ~(ADVERTISED_Pause |
+                                      ADVERTISED_Asym_Pause);
+
        status = rd32(E1000_STATUS);
 
        if (status & E1000_STATUS_LU) {
@@ -386,6 +386,10 @@ static int igb_set_pauseparam(struct net_device *netdev,
        struct e1000_hw *hw = &adapter->hw;
        int retval = 0;
 
+       /* 100basefx does not support setting link flow control */
+       if (hw->dev_spec._82575.eth_flags.e100_base_fx)
+               return -EINVAL;
+
        adapter->fc_autoneg = pause->autoneg;
 
        while (test_and_set_bit(__IGB_RESETTING, &adapter->state))