diff options
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index 0856d0bf821e..2b238caec826 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | |||
@@ -1171,6 +1171,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) | |||
1171 | return IXGBE_ERR_SFP_NOT_PRESENT; | 1171 | return IXGBE_ERR_SFP_NOT_PRESENT; |
1172 | } | 1172 | } |
1173 | 1173 | ||
1174 | /* LAN ID is needed for sfp_type determination */ | ||
1175 | hw->mac.ops.set_lan_id(hw); | ||
1176 | |||
1174 | status = hw->phy.ops.read_i2c_eeprom(hw, | 1177 | status = hw->phy.ops.read_i2c_eeprom(hw, |
1175 | IXGBE_SFF_IDENTIFIER, | 1178 | IXGBE_SFF_IDENTIFIER, |
1176 | &identifier); | 1179 | &identifier); |
@@ -1178,9 +1181,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) | |||
1178 | if (status) | 1181 | if (status) |
1179 | goto err_read_i2c_eeprom; | 1182 | goto err_read_i2c_eeprom; |
1180 | 1183 | ||
1181 | /* LAN ID is needed for sfp_type determination */ | ||
1182 | hw->mac.ops.set_lan_id(hw); | ||
1183 | |||
1184 | if (identifier != IXGBE_SFF_IDENTIFIER_SFP) { | 1184 | if (identifier != IXGBE_SFF_IDENTIFIER_SFP) { |
1185 | hw->phy.type = ixgbe_phy_sfp_unsupported; | 1185 | hw->phy.type = ixgbe_phy_sfp_unsupported; |
1186 | return IXGBE_ERR_SFP_NOT_SUPPORTED; | 1186 | return IXGBE_ERR_SFP_NOT_SUPPORTED; |