|
@@ -1171,6 +1171,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
|
|
return IXGBE_ERR_SFP_NOT_PRESENT;
|
|
return IXGBE_ERR_SFP_NOT_PRESENT;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /* LAN ID is needed for sfp_type determination */
|
|
|
|
+ hw->mac.ops.set_lan_id(hw);
|
|
|
|
+
|
|
status = hw->phy.ops.read_i2c_eeprom(hw,
|
|
status = hw->phy.ops.read_i2c_eeprom(hw,
|
|
IXGBE_SFF_IDENTIFIER,
|
|
IXGBE_SFF_IDENTIFIER,
|
|
&identifier);
|
|
&identifier);
|
|
@@ -1178,9 +1181,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
|
|
if (status)
|
|
if (status)
|
|
goto err_read_i2c_eeprom;
|
|
goto err_read_i2c_eeprom;
|
|
|
|
|
|
- /* LAN ID is needed for sfp_type determination */
|
|
|
|
- hw->mac.ops.set_lan_id(hw);
|
|
|
|
-
|
|
|
|
if (identifier != IXGBE_SFF_IDENTIFIER_SFP) {
|
|
if (identifier != IXGBE_SFF_IDENTIFIER_SFP) {
|
|
hw->phy.type = ixgbe_phy_sfp_unsupported;
|
|
hw->phy.type = ixgbe_phy_sfp_unsupported;
|
|
return IXGBE_ERR_SFP_NOT_SUPPORTED;
|
|
return IXGBE_ERR_SFP_NOT_SUPPORTED;
|