Skip to content

Commit

Permalink
igc: Remove checking media type during MAC initialization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sasha Neftin authored and Jeff Kirsher committed Jun 30, 2020
1 parent 2b374e3 commit f637471
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/ethernet/intel/igc/igc_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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.
Expand Down

0 comments on commit f637471

Please sign in to comment.