UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

igc: Remove checking media type during MAC initialization 

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>
This commit is contained in:
Sasha Neftin 2020-06-17 15:01:31 +03:00 committed by Jeff Kirsher
parent 2b374e3738
commit f637471d33
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/igc/igc_mac.c
View 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 * so we had to force link. In this case, we need to force the
* configuration of the MAC to match the "fc" parameter. * configuration of the MAC to match the "fc" parameter.
*/ */
if (mac->autoneg_failed) { if (mac->autoneg_failed)
if (hw->phy.media_type == igc_media_type_copper) ret_val = igc_force_mac_fc(hw);
ret_val = igc_force_mac_fc(hw);
}
if (ret_val) { if (ret_val) {
hw_dbg("Error forcing flow control settings\n"); 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 * has completed, and if so, how the PHY and link partner has
* flow control configured. * 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 /* Read the MII Status Register and check to see if AutoNeg
* has completed. We read this twice because this reg has * has completed. We read this twice because this reg has
* some "sticky" (latched) bits. * some "sticky" (latched) bits.