igc: Remove checking media type during MAC initialization
authorSasha Neftin <sasha.neftin@intel.com>
Wed, 17 Jun 2020 12:01:31 +0000 (15:01 +0300)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 30 Jun 2020 01:22:03 +0000 (18:22 -0700)
i225 device support only copper mode.
There is no point to check media type in the
igc_config_fc_after_link_up() method.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igc/igc_mac.c

index 9a5e44e..b47e7b0 100644 (file)
@@ -468,10 +468,8 @@ s32 igc_config_fc_after_link_up(struct igc_hw *hw)
         * so we had to force link.  In this case, we need to force the
         * configuration of the MAC to match the "fc" parameter.
         */
-       if (mac->autoneg_failed) {
-               if (hw->phy.media_type == igc_media_type_copper)
-                       ret_val = igc_force_mac_fc(hw);
-       }
+       if (mac->autoneg_failed)
+               ret_val = igc_force_mac_fc(hw);
 
        if (ret_val) {
                hw_dbg("Error forcing flow control settings\n");
@@ -483,7 +481,7 @@ s32 igc_config_fc_after_link_up(struct igc_hw *hw)
         * has completed, and if so, how the PHY and link partner has
         * flow control configured.
         */
-       if (hw->phy.media_type == igc_media_type_copper && mac->autoneg) {
+       if (mac->autoneg) {
                /* Read the MII Status Register and check to see if AutoNeg
                 * has completed.  We read this twice because this reg has
                 * some "sticky" (latched) bits.